summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorNino Breuer2014-10-09 10:06:54 +0200
committerNino Breuer2014-10-09 10:06:54 +0200
commitf62790c173b8e90e51c4b170ab4ee30865900e61 (patch)
tree3eed331231789d9c5bb3d139d44f73808e59d7c4 /dozentenmodul/src/main/java
parentfg (diff)
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-f62790c173b8e90e51c4b170ab4ee30865900e61.tar.gz
tutor-module-f62790c173b8e90e51c4b170ab4ee30865900e61.tar.xz
tutor-module-f62790c173b8e90e51c4b170ab4ee30865900e61.zip
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java2
-rw-r--r--dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java129
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java33
-rw-r--r--dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java217
-rw-r--r--dozentenmodul/src/main/java/gui/intro/Login_GUI.java4
-rw-r--r--dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java51
-rw-r--r--dozentenmodul/src/main/java/models/GUIRights.java62
-rw-r--r--dozentenmodul/src/main/java/models/ImageRights.java37
-rw-r--r--dozentenmodul/src/main/java/models/RightsManagement.java31
-rw-r--r--dozentenmodul/src/main/java/models/person.java67
10 files changed, 422 insertions, 211 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index 8a6af0da..cd3cca87 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -154,7 +154,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
panel_1.add(lblNewLabel_2);
chckbxIsLicensed = new JCheckBox("");
- chckbxIsLicensed.setSelected(Image.image.isLicensed());
+ chckbxIsLicensed.setSelected(true);
chckbxIsLicensed.setBounds(266, 52, 97, 23);
panel_1.add(chckbxIsLicensed);
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 1fec8cdb..cf9cb9d2 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -1,7 +1,6 @@
package gui.image;
import gui.intro.About_GUI;
-import gui.intro.Login_GUI;
import gui.intro.MainMenue_GUI;
import java.awt.Color;
@@ -18,7 +17,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;
import javax.swing.JLabel;
@@ -27,7 +25,6 @@ import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JRadioButton;
import javax.swing.JSeparator;
import javax.swing.JSpinner;
import javax.swing.JTextArea;
@@ -66,10 +63,7 @@ public class EditImageTechnisch_GUI extends JFrame {
JSpinner spinnerRam;
private JCheckBox chckbxIsLicensed;
private JCheckBox chckbxIsInternetBlocked;
- private final ButtonGroup buttonGrouplicense = new ButtonGroup();
- private final ButtonGroup buttonGroupInternet = new ButtonGroup();
- private final ButtonGroup buttonGroupVorlage = new ButtonGroup();
- JComboBox comboBox;
+ JComboBox<String> comboBox;
ThriftConnection con = new ThriftConnection();
Client client = models.Client.clientcon.getClient();
private static final String HELP_MESSAGE = "<html><div align = \"center\">" +
@@ -157,34 +151,11 @@ public class EditImageTechnisch_GUI extends JFrame {
chckbxIsInternetBlocked.setBounds(266, 85, 97, 23);
panel_1.add(chckbxIsInternetBlocked);
- //rdbtnlicenseJa = new JRadioButton("Ja");
- //rdbtnlicenseJa.setSelected(true);
- //buttonGrouplicense.add(rdbtnlicenseJa);
- //rdbtnlicenseJa.setBounds(266, 76, 109, 23);
- //panel_1.add(rdbtnlicenseJa);
-
- //rdbtnlicenseNein = new JRadioButton("Nein");
- //buttonGrouplicense.add(rdbtnlicenseNein);
- //rdbtnlicenseNein.setBounds(377, 76, 53, 23);
- //panel_1.add(rdbtnlicenseNein);
-
-
JLabel lblInternetIstInnerhalb = new JLabel(
"Internet ist innerhalb des Images gesperrt:");
lblInternetIstInnerhalb.setBounds(10, 86, 250, 20);
panel_1.add(lblInternetIstInnerhalb);
- /*rdbtnInternetJa = new JRadioButton("Ja");
- buttonGroupInternet.add(rdbtnInternetJa);
- rdbtnInternetJa.setBounds(266, 104, 109, 23);
- panel_1.add(rdbtnInternetJa);
-
- rdbtnInternetNein = new JRadioButton("Nein");
- rdbtnInternetNein.setSelected(true);
- buttonGroupInternet.add(rdbtnInternetNein);
- rdbtnInternetNein.setBounds(377, 104, 53, 23);
- panel_1.add(rdbtnInternetNein);
- */
JLabel label = new JLabel("Lizenzserver eintragen:");
label.setBounds(10, 115, 250, 20);
panel_1.add(label);
@@ -194,62 +165,32 @@ public class EditImageTechnisch_GUI extends JFrame {
button.setBounds(266, 114, 157, 23);
panel_1.add(button);
- //radioButtonVorlageJa = new JRadioButton("Ja");
- //buttonGroupVorlage.add(radioButtonVorlageJa);
- //radioButtonVorlageJa.setBounds(266, 50, 41, 23);
- //panel_1.add(radioButtonVorlageJa);
-
- //radioButtonVorlageNein = new JRadioButton("Nein");
- //radioButtonVorlageNein.setSelected(true);
- //buttonGroupVorlage.add(radioButtonVorlageNein);
- //radioButtonVorlageNein.setBounds(377, 50, 46, 23);
- //panel_1.add(radioButtonVorlageNein);
-
JLabel lblBetriebssystem = new JLabel("Betriebssystem:");
lblBetriebssystem.setBounds(10, 26, 250, 20);
panel_1.add(lblBetriebssystem);
- comboBox = new JComboBox();
+ comboBox = new JComboBox<String>();
+ List<String> os = null;
try {
- List<String> os=client.getAllOS();
- for(int i=0;i<os.size();i++)
- {
+ os=client.getAllOS();
+ for(int i=0;i<os.size();i++) {
comboBox.addItem(os.get(i).toString());
-
}
} catch (TException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
LOGGER.info("OS of this image: " + Image.image.getOS());
- for(int i =0;i<comboBox.getItemCount();i++)
- {
- if(comboBox.getItemAt(i).equals(Image.image.getOS()+" bit")){
-
- comboBox.setSelectedIndex(i);
-
- }
- }
- LOGGER.debug(comboBox.getSelectedItem().toString());
+ // since the name of the OS is mapped to an internal value
+ // ex: 'Ubuntu x.x 64 Bit' to 'ubuntu-64' it needs a bit
+ // more work to set this box correctly...
+ // TODO: use getOS(key) from the client to get the string from the key
+ //comboBox.setSelectedItem(Client.getOs(Image.image.getOS()));
comboBox.setBounds(270, 26, 277, 20);
panel_1.add(comboBox);
-
-
- if(Image.image.isInternet() == true ){
- chckbxIsInternetBlocked.setSelected(true);
- } else {
- chckbxIsInternetBlocked.setSelected(false);
- }
-
- if (Image.image.isLicensed() == true) {
- //rdbtnlicenseJa.setSelected(true);
- chckbxIsLicensed.setSelected(true);
- chckbxIsLicensed.isSelected();
- } else {
- //rdbtnlicenseNein.setSelected(true);
- chckbxIsLicensed.setSelected(false);
- }
+ chckbxIsInternetBlocked.setSelected(Image.image.isInternet());
+ chckbxIsLicensed.setSelected(Image.image.isLicensed());
JLabel lblHauptmen = new JLabel("Hauptmenü");
lblHauptmen.addMouseListener(new MouseAdapter() {
@@ -368,19 +309,8 @@ public class EditImageTechnisch_GUI extends JFrame {
spinnerCPU.getValue().toString()).intValue());
Image.image.setRam(Integer.valueOf(
spinnerRam.getValue().toString()).intValue());
- if (chckbxIsInternetBlocked.isSelected() == true) {
- Image.image.setInternet(true);
- } else {
- Image.image.setInternet(false);
- }
-
- if (chckbxIsLicensed.isSelected() == true) {
- Image.image.setLicensed(true);
- } else {
- Image.image.setLicensed(false);
- }
-
-
+ Image.image.setInternet(chckbxIsInternetBlocked.isSelected());
+ Image.image.setLicensed(chckbxIsLicensed.isSelected());
Image.image.setOS(comboBox.getSelectedItem().toString());
// oeffnet das vorherige Fenster
EditImageAllgemein_GUI ei = new EditImageAllgemein_GUI();
@@ -400,19 +330,8 @@ public class EditImageTechnisch_GUI extends JFrame {
spinnerCPU.getValue().toString()).intValue());
Image.image.setRam(Integer.valueOf(
spinnerRam.getValue().toString()).intValue());
- if (chckbxIsInternetBlocked.isSelected() == true) {
- Image.image.setInternet(true);
- } else {
- Image.image.setInternet(false);
- }
-
- if (chckbxIsLicensed.isSelected() == true) {
- Image.image.setLicensed(true);
- } else {
- Image.image.setLicensed(false);
- }
-
-
+ Image.image.setInternet(chckbxIsInternetBlocked.isSelected());
+ Image.image.setLicensed(chckbxIsLicensed.isSelected());
Image.image.setOS(comboBox.getSelectedItem().toString());
LOGGER.info("OS: " + Image.image.getOS() +
", Vorlage: " + Image.image.isVorlage() +
@@ -450,15 +369,10 @@ public class EditImageTechnisch_GUI extends JFrame {
mntmFaq.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent arg0) {
-
- OpenLinks open = new OpenLinks();
-
URI windows;
try {
windows = new URI(Links.getFAQ());
-
- open.openWebpage(windows);
-
+ OpenLinks.openWebpage(windows);
} catch (URISyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -467,25 +381,18 @@ public class EditImageTechnisch_GUI extends JFrame {
});
mnNewMenu_1.add(mntmFaq);
-
JMenuItem mntmOtrs = new JMenuItem("OTRS");
mntmOtrs.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent arg0) {
-
- OpenLinks open = new OpenLinks();
-
URI windows;
try {
windows = new URI(Links.getOTRS());
-
- open.openWebpage(windows);
-
+ OpenLinks.openWebpage(windows);
} catch (URISyntaxException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
-
}
});
mnNewMenu_1.add(mntmOtrs);
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 985a9bf7..a4300f97 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -41,6 +41,7 @@ import javax.swing.filechooser.FileNameExtensionFilter;
import models.Image;
import models.Links;
+import models.RightsManagement;
import models.SessionData;
import models.person;
@@ -659,11 +660,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
person.verantwortlicher.getEMail(),
person.verantwortlicher.getTel(),
person.verantwortlicher.getFakultaet(),
- Image.image.isLicensed(), Image.image.isInternet(),
- Image.image.getRam(), Image.image.getCpu(), "temp/"
- + Image.image.getNewName(),
- Image.image.isVorlage(), Image.image.getFilesize(),
- Image.image.getShareMode(), Image.image.getOS());
+ Image.image.isLicensed(),
+ Image.image.isInternet(),
+ Image.image.getRam(),
+ Image.image.getCpu(),
+ "temp/"+ Image.image.getNewName(),
+ Image.image.isVorlage(),
+ Image.image.getFilesize(),
+ Image.image.getShareMode(),
+ Image.image.getOS());
client.startFileCopy(Image.image.getNewName());
@@ -673,7 +678,23 @@ public class FTPCreateUploader_GUI extends JFrame implements
person.verantwortlicher.getVorname(),
person.verantwortlicher.getEMail(),
person.verantwortlicher.getHochschule(),
- person.verantwortlicher.getRole());
+ person.verantwortlicher.getRole()
+ );
+
+ for(int i=0; i< RightsManagement.rightsManagement.getPmImageCreateList().size(); i++){
+ System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPmImageCreateList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPmImageCreateList().size());
+ client.writeAdditionalImageRights(
+ Image.image.getImagename(),
+ RightsManagement.rightsManagement.getPmImageCreateList().get(i).getUserID(),
+ RightsManagement.rightsManagement.getPmImageCreateList().get(i).isRead(),
+ RightsManagement.rightsManagement.getPmImageCreateList().get(i).isWrite(),
+ RightsManagement.rightsManagement.getPmImageCreateList().get(i).isLinkAllowed(),
+ RightsManagement.rightsManagement.getPmImageCreateList().get(i).isAdmin()
+ );
+
+ }//end for
+
+
} catch (TException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 5731d7d1..63323969 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -1,9 +1,9 @@
package gui.image;
import gui.intro.About_GUI;
+import gui.intro.Login_GUI;
import gui.intro.MainMenue_GUI;
-import java.awt.Checkbox;
import java.awt.Color;
import java.awt.Component;
import java.awt.FlowLayout;
@@ -18,14 +18,14 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import javax.swing.AbstractButton;
-import javax.swing.ButtonGroup;
import javax.swing.DefaultComboBoxModel;
-import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
@@ -36,41 +36,48 @@ import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JScrollPane;
import javax.swing.JSeparator;
+import javax.swing.JTable;
+import javax.swing.JTextField;
import javax.swing.JTextPane;
+import javax.swing.ScrollPaneConstants;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.JTableHeader;
-import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import models.Image;
+import models.ImageRights;
import models.Links;
-import util.GuiOrganizer;
-import util.OpenLinks;
-import javax.swing.JTable;
-import javax.swing.JScrollPane;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.JTextField;
+import models.RightsManagement;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
+import org.apache.log4j.Logger;
+import org.apache.thrift.TException;
-import java.awt.Choice;
+import server.generated.Server.Client;
+import server.generated.Person;
+import models.person;
+import util.GuiOrganizer;
+import util.OpenLinks;
@SuppressWarnings("serial")
public class PermissionCreateImage_GUI extends JFrame {
+ private final static Logger LOGGER = Logger.getLogger(Login_GUI.class);
+ Client client = models.Client.clientcon.getClient();
private final JPanel contentPanel = new JPanel();
String[] result;
- private JTable table;
+ private JTable table = null;
private Class[] classes;
- Object[] titles = { "Name", "Read", "Write", "Link","Admin"};
+ Object[] titles = { "Name", "Read", "Write", "Link", "Admin", "userID" };
+ private List<Person> map = null;
+ // Map<String,String> ogUsers = new HashMap();
final DefaultTableModel model = new DefaultTableModel(titles, 0) {
@@ -91,6 +98,7 @@ public class PermissionCreateImage_GUI extends JFrame {
}
};
+
private JTextField textField;
private JLabel lblRead;
private JLabel lblWrite;
@@ -177,10 +185,85 @@ public class PermissionCreateImage_GUI extends JFrame {
table = new JTable();
table.setModel(model);
table.setSelectionForeground(Color.WHITE);
- Object[] rowdata = { "Max Mustermann", new Boolean(false),
- new Boolean(false), new Boolean(false), new Boolean(false),
- new Boolean(false) };
- model.addRow(rowdata);
+
+ // invisible attribute userID for identifying selected user
+ table.getColumnModel().getColumn(5).setWidth(0);
+ table.getColumnModel().getColumn(5).setMinWidth(0);
+ table.getColumnModel().getColumn(5).setMaxWidth(0);
+
+ // if new session, get values for table from database
+ if (RightsManagement.rightsManagement.getPmImageCreateList().size() <= 0) {
+ System.out.println("getting data from db");
+ System.out.println(RightsManagement.rightsManagement
+ .getPmImageCreateList().size());
+
+ person.verantwortlicher.getUserID();
+ System.out.println("Current userID: " +person.verantwortlicher.getUserID());
+
+ try {
+ map = client.getAllOtherSatelliteUsers(person.verantwortlicher.getUserID());
+ Iterator<server.generated.Person> i = map.iterator();
+
+ int x = 0;
+ while (i.hasNext()) {
+ // erzeuge Objekte fuer die Tabelle
+ Object[] obj = {
+ map.get(x).getNachname() + ", "
+ + map.get(x).getVorname(), // Name
+ false, // Read
+ false, // Write
+ false, // Link
+ false, // Admin
+ map.get(x).getUserID() // userID
+ };
+ // Fuege diese Objekte der Tabelle hinzu
+ model.addRow(obj);
+ i.next();
+ x++;
+
+ }
+ System.out
+ .println("Number of returned users in permission list: "
+ + map.size());
+
+ } catch (TException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ } else // read from model
+ {
+ System.out
+ .println("RightsManagement.rightsManagement.getPmImageCreateList().size() "
+ + RightsManagement.rightsManagement
+ .getPmImageCreateList().size());
+ System.out.println("reading from model");
+ List<person> listt = RightsManagement.rightsManagement
+ .getPmImageCreateList();
+ Iterator<person> i = listt.iterator();
+
+ int x = 0;
+ while (i.hasNext()) {
+ System.out.println("current pos=" + x);
+ // erzeuge Objekte fuer die Tabelle
+ person temp = i.next();
+
+ Object[] obj = { temp.getName() + ", " + temp.getVorname(), // Name
+ temp.isRead(), // Read
+ temp.isWrite(), // Write
+ temp.isLinkAllowed(), // Link
+ temp.isAdmin(), // Admin
+ temp.getUserID() // userID
+ };
+ System.out.println("Processing: " + temp.getName() + ", "
+ + temp.getVorname() + ", " + temp.isRead() + ", "
+ + temp.isWrite() + ", " + temp.isLinkAllowed() + ", "
+ + temp.isAdmin() + ", " + temp.getUserID());
+ // Fuege diese Objekte der Tabelle hinzu
+ model.addRow(obj);
+ x++;
+
+ }
+ }
TableCellRenderer rend = table.getTableHeader().getDefaultRenderer();
@@ -208,35 +291,30 @@ public class PermissionCreateImage_GUI extends JFrame {
tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),
(String) titles[4]));
- /*
- TableColumn tc5 = table.getColumnModel().getColumn(5);
- tc5.setCellEditor(table.getDefaultEditor(Boolean.class));
- tc5.setCellRenderer(table.getDefaultRenderer(Boolean.class));
- tc5.setHeaderRenderer(new CheckBoxHeader(new MyItemListener5(),
- (String) titles[5]));
- */
+
scrollPane.setViewportView(table);
-
+
JPanel panel = new JPanel();
panel.setLayout(null);
panel.setBorder(new TitledBorder(null, "Freigabe",
- TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel.setBackground(SystemColor.menu);
panel.setBounds(10, 201, 537, 80);
panel_1.add(panel);
-
+
JLabel label = new JLabel("Freigabemodus:");
label.setBounds(10, 30, 250, 20);
panel.add(label);
-
+
final JComboBox comboBox_1 = new JComboBox();
- comboBox_1.setModel(new DefaultComboBoxModel(new String[] {
- "Lokal (Eigene Hochschule)",
- "Öffentlich (Alle Hochschulen)" }));
+ comboBox_1
+ .setModel(new DefaultComboBoxModel(new String[] {
+ "Lokal (Eigene Hochschule)",
+ "Öffentlich (Alle Hochschulen)" }));
comboBox_1.setSelectedIndex(0);
comboBox_1.setBounds(270, 30, 250, 20);
panel.add(comboBox_1);
-
+
JLabel lblHauptmen = new JLabel("Hauptmenü");
lblHauptmen.addMouseListener(new MouseAdapter() {
@Override
@@ -268,7 +346,7 @@ public class PermissionCreateImage_GUI extends JFrame {
lblNewLabel_1.setBounds(146, 11, 80, 14);
contentPanel.add(lblNewLabel_1);
- JLabel lblName = new JLabel("Name:");
+ JLabel lblName = new JLabel("Nach Namen filtern:");
lblName.setBounds(10, 36, 46, 20);
contentPanel.add(lblName);
@@ -331,11 +409,11 @@ public class PermissionCreateImage_GUI extends JFrame {
"Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
lblLinkallowedDesc.setBounds(120, 58, 380, 20);
panel_2.add(lblLinkallowedDesc);
-
+
chckbxFrAlleSichtbar = new JCheckBox("");
chckbxFrAlleSichtbar.setBounds(115, 119, 21, 23);
panel_2.add(chckbxFrAlleSichtbar);
-
+
lblFuerAlleSichtbar = new JLabel("Für alle sichtbar");
lblFuerAlleSichtbar.setBounds(20, 120, 90, 20);
panel_2.add(lblFuerAlleSichtbar);
@@ -350,7 +428,7 @@ public class PermissionCreateImage_GUI extends JFrame {
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- //CreateImageFreigabe_GUI sr = new CreateImageFreigabe_GUI();
+
CreateImageTechnisch_GUI ci = new CreateImageTechnisch_GUI();
ci.setVisible(true);
dispose();
@@ -365,6 +443,8 @@ public class PermissionCreateImage_GUI extends JFrame {
continueButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
+ saveTableToList();
+
Image.image.setShareMode(comboBox_1.getSelectedIndex());
FTPCreateUploader_GUI ea = new FTPCreateUploader_GUI();
ea.setVisible(true);
@@ -514,6 +594,61 @@ public class PermissionCreateImage_GUI extends JFrame {
}
}
}
+
+ public void createRightsList() {
+ // /////
+ }
+
+ private void saveTableToList() {
+ System.out.println("Saving Table to List");
+
+ List<person> list = new ArrayList<person>();
+
+ int seperatorIndex = 0;
+
+ // get values from table and save the checkbox values
+ if(map==null) System.out.println("Fuck: map is null");
+
+ //for (int i = 0; i < map.size(); i++) {
+ for (int i = 0; i < table.getRowCount(); i++) {
+ System.out.println("in for, rowcount="+table.getRowCount());
+ person temp = new person();
+
+ // table.getModel().setValueAt(map.get, i, 5);
+
+ temp.setUserID(table.getModel().getValueAt(i, 5).toString()); // get
+ // userID
+ temp.setAdmin(Boolean.parseBoolean(table.getModel()
+ .getValueAt(i, 4).toString())); // get Admin
+ temp.setLinkAllowed(Boolean.parseBoolean(table.getModel()
+ .getValueAt(i, 3).toString()));// get Link
+ temp.setWrite(Boolean.parseBoolean(table.getModel()
+ .getValueAt(i, 2).toString()));// get Write
+ temp.setRead(Boolean.parseBoolean(table.getModel().getValueAt(i, 1)
+ .toString()));// get Read
+ seperatorIndex = table.getModel().getValueAt(i, 0).toString()
+ .indexOf(",");
+ temp.setName(table.getModel().getValueAt(i, 0).toString()
+ .substring(0, seperatorIndex));
+ temp.setVorname(table.getModel().getValueAt(i, 0).toString()
+ .substring(seperatorIndex + 2));
+
+ list.add(temp);
+
+ System.out.println(temp.getName() + ", " + temp.getVorname() + ", "
+ + temp.getUserID() + ", " + temp.isAdmin() + ", "
+ + temp.isLinkAllowed() + ", " + temp.isWrite() + ", "
+ + temp.isRead());
+ }
+ System.out.println("Now setting List information. Length is: "
+ + list.size());
+ for (int y = 0; y < list.size(); y++) {
+ System.out.println("" + list.get(y).getName());
+ }
+ RightsManagement.rightsManagement.setPmImageCreateList(list);
+
+ }
+
}
class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
@@ -541,8 +676,7 @@ class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
}
}
setColumn(column);
- // rendererComponent.setText("Check All");
- // setBorder(UIManager.getBorder("TableHeader.cellBorder"));
+
return rendererComponent;
}
@@ -588,4 +722,5 @@ class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
public void mouseExited(MouseEvent e) {
}
+
}
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index a20daa55..42fa9409 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -181,6 +181,7 @@ public class Login_GUI extends JFrame {
MasterThriftConnection thrift = new MasterThriftConnection();
Client client = thrift.getMasterThriftConnection();
+
if (client == null) {
// Thrift connection to master could not be established
setStatus(Color.red, "Fehler: Masterserver nicht erreichbar.", null);
@@ -243,13 +244,14 @@ public class Login_GUI extends JFrame {
//person.verantwortlicher.setUsername(lblusername.getText().substring(0,lblusername.getText().indexOf("@")));
person.verantwortlicher.setUsername(lblusername.getText().trim());
+ person.verantwortlicher.setUserID(lblusername.getText().trim());
person.verantwortlicher.setName(user.lastName);
person.verantwortlicher.setVorname(user.firstName);
person.verantwortlicher.setEMail(user.eMail);
person.verantwortlicher.setHochschule(hochschule);
// Spaeter ueber result.getRole zum Beispiel die Rolle holen
- person.verantwortlicher.setRole("Dozent");
+ person.verantwortlicher.setRole("Dozent");
// person.verantwortlicher.setRole("Admin");
// person.verantwortlicher.setRole("Student");
// person.verantwortlicher.setRole("GetToTheChopper!");
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index d0c83350..d4bb2fd8 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -43,6 +43,7 @@ import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
+import models.GUIRights;
import models.ImageRights;
import models.Links;
import models.SessionData;
@@ -546,39 +547,39 @@ public class MainMenue_GUI extends JFrame {
// role==Student
if (person.verantwortlicher.getRole().equals("Student")) {
- ImageRights.rights.setRead(1);
- ImageRights.rights.setWrite(0);
- ImageRights.rights.setChangePermission(0);
- ImageRights.rights.setAdmin(0);
- ImageRights.rights.setLinkAllowed(0);
+ GUIRights.rights.setRead(1);
+ GUIRights.rights.setWrite(0);
+ GUIRights.rights.setChangePermission(0);
+ GUIRights.rights.setAdmin(0);
+ GUIRights.rights.setLinkAllowed(0);
} else if (person.verantwortlicher.getRole().equals("Dozent")) { // role==Dozent
- ImageRights.rights.setRead(1);
- ImageRights.rights.setWrite(1);
- ImageRights.rights.setChangePermission(0);
- ImageRights.rights.setAdmin(0);
- ImageRights.rights.setLinkAllowed(1);
+ GUIRights.rights.setRead(1);
+ GUIRights.rights.setWrite(1);
+ GUIRights.rights.setChangePermission(0);
+ GUIRights.rights.setAdmin(0);
+ GUIRights.rights.setLinkAllowed(1);
} else if (person.verantwortlicher.getRole().equals("Admin")) { // role==Admin
- ImageRights.rights.setRead(1);
- ImageRights.rights.setWrite(1);
- ImageRights.rights.setChangePermission(1);
- ImageRights.rights.setAdmin(1);
- ImageRights.rights.setLinkAllowed(1);
+ GUIRights.rights.setRead(1);
+ GUIRights.rights.setWrite(1);
+ GUIRights.rights.setChangePermission(1);
+ GUIRights.rights.setAdmin(1);
+ GUIRights.rights.setLinkAllowed(1);
} else { // role==Nothing
- ImageRights.rights.setRead(0);
- ImageRights.rights.setWrite(0);
- ImageRights.rights.setChangePermission(0);
- ImageRights.rights.setAdmin(0);
- ImageRights.rights.setLinkAllowed(0);
+ GUIRights.rights.setRead(0);
+ GUIRights.rights.setWrite(0);
+ GUIRights.rights.setChangePermission(0);
+ GUIRights.rights.setAdmin(0);
+ GUIRights.rights.setLinkAllowed(0);
}// end if else
// always print rights information
LOGGER.info("Rights: (r, w, cp, a, la) = ("
- + ImageRights.rights.getRead() + ", "
- + ImageRights.rights.getWrite() + ", "
- + ImageRights.rights.getChangePermission() + ", "
- + ImageRights.rights.getAdmin() + ", "
- + ImageRights.rights.getLinkAllowed() + ")");
+ + GUIRights.rights.getRead() + ", "
+ + GUIRights.rights.getWrite() + ", "
+ + GUIRights.rights.getChangePermission() + ", "
+ + GUIRights.rights.getAdmin() + ", "
+ + GUIRights.rights.getLinkAllowed() + ")");
}// end setRoleRights
public void setCorrectRadioButton() {
diff --git a/dozentenmodul/src/main/java/models/GUIRights.java b/dozentenmodul/src/main/java/models/GUIRights.java
new file mode 100644
index 00000000..a1937b78
--- /dev/null
+++ b/dozentenmodul/src/main/java/models/GUIRights.java
@@ -0,0 +1,62 @@
+package models;
+
+public class GUIRights {
+
+ private int read;
+ private int write;
+ private int changePermission;
+ private int admin;
+ private int linkAllowed;
+ private String userID;
+
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public static GUIRights rights = new GUIRights();
+
+ public int getRead() {
+ return read;
+ }
+
+ public void setRead(int read) {
+ this.read = read;
+ }
+
+ public int getWrite() {
+ return write;
+ }
+
+ public void setWrite(int write) {
+ this.write = write;
+ }
+
+ public int getChangePermission() {
+ return changePermission;
+ }
+
+ public void setChangePermission(int changePermission) {
+ this.changePermission = changePermission;
+ }
+
+ public int getAdmin() {
+ return admin;
+ }
+
+ public void setAdmin(int admin) {
+ this.admin = admin;
+ }
+
+ public int getLinkAllowed() {
+ return linkAllowed;
+ }
+
+ public void setLinkAllowed(int linkAllowed) {
+ this.linkAllowed = linkAllowed;
+ }
+
+}
diff --git a/dozentenmodul/src/main/java/models/ImageRights.java b/dozentenmodul/src/main/java/models/ImageRights.java
index 1b7e0e55..c5b5efbb 100644
--- a/dozentenmodul/src/main/java/models/ImageRights.java
+++ b/dozentenmodul/src/main/java/models/ImageRights.java
@@ -2,41 +2,48 @@ package models;
public class ImageRights {
- private int read;
- private int write;
- private int changePermission;
- private int admin;
- private int linkAllowed;
+ private boolean read;
+ private boolean write;
+ private boolean changePermission;
+ private boolean admin;
+ private boolean linkAllowed;
+ private String userID;
+ public String getUserID() {
+ return userID;
+ }
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
public static ImageRights rights =new ImageRights();
- public int getRead() {
+ public boolean getRead() {
return read;
}
- public void setRead(int read) {
+ public void setRead(boolean read) {
this.read = read;
}
- public int getWrite() {
+ public boolean getWrite() {
return write;
}
- public void setWrite(int write) {
+ public void setWrite(boolean write) {
this.write = write;
}
- public int getChangePermission() {
+ public boolean getChangePermission() {
return changePermission;
}
- public void setChangePermission(int changePermission) {
+ public void setChangePermission(boolean changePermission) {
this.changePermission = changePermission;
}
- public int getAdmin() {
+ public boolean getAdmin() {
return admin;
}
- public void setAdmin(int admin) {
+ public void setAdmin(boolean admin) {
this.admin = admin;
}
- public int getLinkAllowed() {
+ public boolean getLinkAllowed() {
return linkAllowed;
}
- public void setLinkAllowed(int linkAllowed) {
+ public void setLinkAllowed(boolean linkAllowed) {
this.linkAllowed = linkAllowed;
}
diff --git a/dozentenmodul/src/main/java/models/RightsManagement.java b/dozentenmodul/src/main/java/models/RightsManagement.java
new file mode 100644
index 00000000..38661870
--- /dev/null
+++ b/dozentenmodul/src/main/java/models/RightsManagement.java
@@ -0,0 +1,31 @@
+package models;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RightsManagement {
+
+
+ public RightsManagement(){
+ //
+ }
+
+
+
+ //list which holds all users and (non-)selected values of the table rightstable in permissionCreateImage
+ private List<person> pmImageCreateList = new ArrayList<person>();
+
+
+
+
+ public static RightsManagement rightsManagement = new RightsManagement();
+
+ public List<person> getPmImageCreateList() {
+ return pmImageCreateList;
+ }
+
+ public void setPmImageCreateList(List<person> list) {
+ this.pmImageCreateList = list;
+ }
+
+}
diff --git a/dozentenmodul/src/main/java/models/person.java b/dozentenmodul/src/main/java/models/person.java
index 479c2ecd..1d8e26e1 100644
--- a/dozentenmodul/src/main/java/models/person.java
+++ b/dozentenmodul/src/main/java/models/person.java
@@ -1,28 +1,73 @@
package models;
-public class person{
+public class person {
private String username;
-
+ private String userID;
private String Name;
-
private String Vorname;
-
private String Hochschule;
-
private String EMail;
-
private String Tel;
-
private String Fakultaet;
-
private boolean ischecked;
-
private String role;
+ private boolean read;
+ private boolean write;
+ private boolean changePermission;
+ private boolean admin;
+ private boolean linkAllowed;
+
- public static person verantwortlicher=new person();
+ public boolean isRead() {
+ return read;
+ }
-
+ public void setRead(boolean read) {
+ this.read = read;
+ }
+
+ public boolean isWrite() {
+ return write;
+ }
+
+ public void setWrite(boolean write) {
+ this.write = write;
+ }
+
+ public boolean isChangePermission() {
+ return changePermission;
+ }
+
+ public void setChangePermission(boolean changePermission) {
+ this.changePermission = changePermission;
+ }
+
+ public boolean isAdmin() {
+ return admin;
+ }
+
+ public void setAdmin(boolean admin) {
+ this.admin = admin;
+ }
+
+ public boolean isLinkAllowed() {
+ return linkAllowed;
+ }
+
+ public void setLinkAllowed(boolean linkAllowed) {
+ this.linkAllowed = linkAllowed;
+ }
+
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public static person verantwortlicher = new person();
public String getRole() {
return role;
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-03-06 22:43:23 +0100