summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/ftp
diff options
context:
space:
mode:
Diffstat (limited to 'Dozentenmodul/src/ftp')
-rw-r--r--Dozentenmodul/src/ftp/FTPUtility.java40
-rw-r--r--Dozentenmodul/src/ftp/UploadTask.java3
2 files changed, 4 insertions, 39 deletions
diff --git a/Dozentenmodul/src/ftp/FTPUtility.java b/Dozentenmodul/src/ftp/FTPUtility.java
index b4543349..f2c51dfc 100644
--- a/Dozentenmodul/src/ftp/FTPUtility.java
+++ b/Dozentenmodul/src/ftp/FTPUtility.java
@@ -196,44 +196,6 @@ public class FTPUtility {
return outputStream;
}
- public String[] getAllRohling(String SearchString) throws SocketException
- {
- //FTPClient ftp=new FTPClient();
-
- String[] filenamelist;
-
-
- try {
-
-
- ftpClient.changeWorkingDirectory("/home/openslx/images");
- filenamelist=ftpClient.listNames();
-
- String[] search=new String[filenamelist.length];
- for(int i=0;i<filenamelist.length;i++)
- {
- /*if(filenamelist[i].startsWith(SearchString)==true)
- {
- search[i]=filenamelist[i];
- }*/
-
- if(filenamelist[i].contains(SearchString)==true)
- {
- search[i]=filenamelist[i];
- }
- }
- return search;
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- JOptionPane.showMessageDialog(null,
- e.getCause()+"\n"+e.getMessage(),
- "Debug-Message", JOptionPane.ERROR_MESSAGE);
- }
-
-
-
- return null;
- }
+
} \ No newline at end of file
diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java
index 788acad6..2dbeff8d 100644
--- a/Dozentenmodul/src/ftp/UploadTask.java
+++ b/Dozentenmodul/src/ftp/UploadTask.java
@@ -5,6 +5,8 @@ import java.io.FileInputStream;
import javax.swing.JOptionPane;
import javax.swing.SwingWorker;
+
+import models.Image;
/**
* Executes the file upload in a background thread and updates progress to
@@ -50,6 +52,7 @@ public class UploadTask extends SwingWorker<Void, Void> {
long totalBytesRead = 0;
int percentCompleted = 0;
long fileSize = uploadFile.length();
+ Image.image.setFilesize(fileSize);
long start=System.nanoTime();
final double NANOS_PER_SECOND = 1000000000.0;
final double BYTES_PER_MIB = 1024*1024;