summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java27
1 files changed, 6 insertions, 21 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 5e1607a8..7ebd604d 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -60,10 +60,9 @@ import models.Links;
import models.SessionData;
import models.person;
-import org.apache.log4j.Logger;
import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
-import server.generated.Server.Client;
import thrift.ThriftConnection;
import util.OpenLinks;
//import models.person;
@@ -71,12 +70,6 @@ import util.OpenLinks;
@SuppressWarnings("serial")
public class SearchEditImage_GUI extends JFrame {
- /**
- * Logger instance for this class.
- */
- private final static Logger LOGGER = Logger
- .getLogger(SearchEditImage_GUI.class);
-
private final JPanel contentPanel = new JPanel();
JLabel labelName;
JLabel labelUpdate;
@@ -138,7 +131,7 @@ public class SearchEditImage_GUI extends JFrame {
final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
modelMyImages);
- RowFilter rf = null;
+ RowFilter<Object, Object> rf = null;
List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
private JLabel lblTotalResults;
@@ -401,8 +394,6 @@ public class SearchEditImage_GUI extends JFrame {
public void actionPerformed(ActionEvent arg0) {
// oeffnet den Downloader
- String username = person.verantwortlicher.getName() + " "
- + person.verantwortlicher.getVorname();
// check if user is in correct tab
/* if (tabbedPane.getSelectedIndex() == 0) { */
// check if a row is selected
@@ -514,8 +505,6 @@ public class SearchEditImage_GUI extends JFrame {
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- String username = person.verantwortlicher.getName()
- + " " + person.verantwortlicher.getVorname();
// check if user is in correct tab
// if (tabbedPane.getSelectedIndex() == 0) {
// check if a row is selected
@@ -694,13 +683,11 @@ public class SearchEditImage_GUI extends JFrame {
@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) {
e.printStackTrace();
@@ -714,13 +701,11 @@ public class SearchEditImage_GUI extends JFrame {
@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) {
e.printStackTrace();
@@ -759,7 +744,7 @@ public class SearchEditImage_GUI extends JFrame {
//LOGGER.debug("trying to init table first time... in: searcheditimage_gui");
- List<server.generated.Image> images;
+ List<org.openslx.sat.thrift.iface.Image> images;
try {
// Hole eine Liste der passenden Images,
@@ -771,7 +756,7 @@ public class SearchEditImage_GUI extends JFrame {
images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
}
- Iterator<server.generated.Image> i = images.iterator();
+ Iterator<org.openslx.sat.thrift.iface.Image> i = images.iterator();
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
int x = 0;