From 265946d452f1374d2a43c71f1403a4da7712194c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 19 Feb 2015 17:52:27 +0100
Subject: Remove client -> server dependency, move thrift classes to
master-sync-shared
---
dozentenmodul/pom.xml | 6 +-
.../java/gui/image/CreateImageAllgemein_GUI.java | 15 +-
.../java/gui/image/CreateImageTechnisch_GUI.java | 20 +-
.../src/main/java/gui/image/DeleteImage_GUI.java | 27 +-
.../java/gui/image/EditImageAllgemein_GUI.java | 21 +-
.../java/gui/image/EditImageTechnisch_GUI.java | 17 +-
.../main/java/gui/image/FTPCreateUploader_GUI.java | 126 +-
.../main/java/gui/image/FTPEditDownloader_GUI.java | 22 +-
.../main/java/gui/image/FTPEditUploader_GUI.java | 5 +-
.../java/gui/image/FTPSearchDownloader_GUI.java | 22 +-
.../java/gui/image/PermissionCreateImage_GUI.java | 31 +-
.../java/gui/image/PermissionEditImage_GUI.java | 29 +-
.../main/java/gui/image/SearchEditImage_GUI.java | 27 +-
.../src/main/java/gui/image/SearchImage_GUI.java | 40 +-
.../src/main/java/gui/intro/Login_GUI.java | 6 +-
.../src/main/java/gui/intro/MainMenue_GUI.java | 11 +-
.../gui/lecture/CreateLectureAllgemein_GUI.java | 14 +-
.../java/gui/lecture/CreateLectureLink_GUI.java | 16 +-
.../main/java/gui/lecture/DeleteLecture_GUI.java | 7 +-
.../java/gui/lecture/EditLectureAllgemein_GUI.java | 14 +-
.../main/java/gui/lecture/EditLectureLink_GUI.java | 23 +-
.../java/gui/lecture/EditLectureSearch_GUI.java | 7 +-
.../gui/lecture/PermissionCreateLecture_GUI.java | 27 +-
.../gui/lecture/PermissionEditLecture_GUI.java | 23 +-
.../main/java/gui/lecture/SearchLecture_GUI.java | 21 +-
dozentenmodul/src/main/java/models/Client.java | 8 +-
.../src/main/java/thrift/ThriftConnection.java | 79 +-
.../src/main/java/util/ListAllOtherUsers_GUI.java | 6 +-
dozentenmodulserver/pom.xml | 1 +
.../src/main/java/server/BinaryListener.java | 4 +-
.../src/main/java/server/ServerHandler.java | 23 +-
.../src/main/java/server/generated/Image.java | 1388 -
.../src/main/java/server/generated/Lecture.java | 1188 -
.../src/main/java/server/generated/Person.java | 1350 -
.../src/main/java/server/generated/Server.java | 54780 -------------------
.../src/main/java/server/generated/User.java | 588 -
dozentenmodulserver/src/main/java/sql/SQL.java | 12 +-
.../src/main/java/thrift/ThriftConnection.java | 10 +-
dozentenmodulserver/thrift/server.thrift | 103 -
39 files changed, 288 insertions(+), 59829 deletions(-)
delete mode 100644 dozentenmodulserver/src/main/java/server/generated/Image.java
delete mode 100644 dozentenmodulserver/src/main/java/server/generated/Lecture.java
delete mode 100644 dozentenmodulserver/src/main/java/server/generated/Person.java
delete mode 100644 dozentenmodulserver/src/main/java/server/generated/Server.java
delete mode 100644 dozentenmodulserver/src/main/java/server/generated/User.java
delete mode 100644 dozentenmodulserver/thrift/server.thrift
diff --git a/dozentenmodul/pom.xml b/dozentenmodul/pom.xml
index dd7c9523..ee870e6a 100644
--- a/dozentenmodul/pom.xml
+++ b/dozentenmodul/pom.xml
@@ -237,11 +237,7 @@
org.openslx.bwlp
master-sync-shared
1.0-SNAPSHOT
-
-
- bwlehrpool
- dozmod-server
- 1.0-SNAPSHOT
+ compile
junit
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
index 325fe62f..60f608a0 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
@@ -25,6 +25,7 @@ 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.JTextArea;
import javax.swing.JTextField;
@@ -38,23 +39,15 @@ import models.Image;
import models.Links;
import models.SessionData;
import models.person;
-import server.generated.Server.Client;
-import util.GuiOrganizer;
-import util.OpenLinks;
-
-import javax.swing.JScrollPane;
-import org.apache.log4j.Logger;
import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
+
+import util.OpenLinks;
@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;
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index e80c3a68..42e98c4f 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -2,7 +2,6 @@ package gui.image;
import gui.intro.About_GUI;
-import gui.intro.Login_GUI;
import gui.intro.MainMenue_GUI;
import java.awt.Color;
@@ -20,9 +19,9 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.List;
-import javax.swing.ButtonGroup;
import javax.swing.JButton;
import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JMenu;
@@ -30,7 +29,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;
@@ -43,20 +41,15 @@ import javax.swing.border.TitledBorder;
import models.Image;
import models.Links;
-
import models.SessionData;
-
import models.person;
-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;
+import org.openslx.sat.thrift.iface.Server.Client;
+
+import thrift.ThriftConnection;
+import util.OpenLinks;
@SuppressWarnings("serial")
public class CreateImageTechnisch_GUI extends JFrame {
@@ -73,9 +66,6 @@ public class CreateImageTechnisch_GUI extends JFrame {
private JCheckBox chckbxIsLicensed;
private JCheckBox chckbxIsInternetBlocked;
JComboBox comboBox;
- private final ButtonGroup buttonGrouplicense = new ButtonGroup();
- private final ButtonGroup buttonGroupInternet = new ButtonGroup();
- private final ButtonGroup buttonGroupVorlage = new ButtonGroup();
ThriftConnection con = new ThriftConnection();
Client client = models.Client.clientcon.getClient();
Component c = null;
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index b1fde196..44e86aae 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -38,8 +38,8 @@ import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
import javax.swing.JTable;
+import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.JTextPane;
import javax.swing.ListSelectionModel;
@@ -48,8 +48,6 @@ import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
import javax.swing.border.TitledBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableModel;
@@ -62,12 +60,11 @@ import models.person;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Image;
+import org.openslx.sat.thrift.iface.Server.Client;
-import server.generated.Server.Client;
import thrift.ThriftConnection;
-import util.GuiOrganizer;
import util.OpenLinks;
-import javax.swing.JTextArea;
@SuppressWarnings("serial")
public class DeleteImage_GUI extends JFrame {
@@ -132,7 +129,7 @@ public class DeleteImage_GUI extends JFrame {
modelMyImages);
- RowFilter rf = null;
+ RowFilter