From be9b6dd4d15f1fdf430121947152ca5f368cfbde Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Sun, 05 Mar 2017 10:52:20 +0000 Subject: [PATCH] TinyMCE laden verbessert --- src/java/de/uhilger/filecms/api/FileMgr.java | 133 +++++-------------------------------------- 1 files changed, 17 insertions(+), 116 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index 7f41566..649357d 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -20,9 +20,6 @@ import de.uhilger.filecms.data.FileRef; import de.uhilger.filecms.web.Initialiser; -//import de.uhilger.filesystem.FileRef; -//import de.uhilger.filesystem.FileSystem; -//import de.uhilger.filesystem.LocalFileSystem; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; @@ -68,13 +65,9 @@ } else { String path = getTargetDir(relPath).getAbsolutePath(); logger.fine("listing path: " + path); - //LocalFileSystem fs = new LocalFileSystem(); - //logger.fine("listing " + getTargetDir(relPath).getAbsolutePath()); File dir = new File(path); if(dir.exists()) { File[] fileArray = dir.listFiles(); - - //FileRef[] fileRefs = fs.list(new FileRef(getTargetDir(relPath).getAbsolutePath(), true)); for(int i = 0; i < fileArray.length; i++) { logger.fine(fileArray[i].toURI().toString()); String fname = fileArray[i].toURI().toString().replace("file:/", ""); @@ -173,32 +166,14 @@ } public String copyFiles(String fromPath, String toPath, List fileNames) { - String result = null; - try { - File srcDir = getTargetDir(fromPath); - File targetDir = getTargetDir(toPath); - Iterator i = fileNames.iterator(); - while(i.hasNext()) { - Object o = i.next(); - if (o instanceof ArrayList) { - ArrayList al = (ArrayList) o; - File srcFile = new File(srcDir, al.get(0).toString()); - if(srcFile.isDirectory()) { - logger.fine("copy dir " + srcFile.getAbsolutePath() + " to dir " + targetDir.getAbsolutePath()); - FileUtils.copyDirectoryToDirectory(srcFile, targetDir); - } else { - logger.fine("copy srcFile " + srcFile.getAbsolutePath() + " to dir " + targetDir.getAbsolutePath()); - FileUtils.copyFileToDirectory(srcFile, targetDir); - } - } - } - } catch (IOException ex) { - logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); - } - return result; + return copyOrMoveFiles(fromPath, toPath, fileNames, OP_COPY); } public String moveFiles(String fromPath, String toPath, List fileNames) { + return copyOrMoveFiles(fromPath, toPath, fileNames, OP_MOVE); + } + + private String copyOrMoveFiles(String fromPath, String toPath, List fileNames, int operation) { String result = null; try { File srcDir = getTargetDir(fromPath); @@ -210,9 +185,17 @@ ArrayList al = (ArrayList) o; File srcFile = new File(srcDir, al.get(0).toString()); if(srcFile.isDirectory()) { - FileUtils.moveDirectoryToDirectory(srcFile, targetDir, false); + if(operation == OP_MOVE) { + FileUtils.moveDirectoryToDirectory(srcFile, targetDir, false); + } else { + FileUtils.copyDirectoryToDirectory(srcFile, targetDir); + } } else { - FileUtils.moveFileToDirectory(srcFile, targetDir, false); + if(operation == OP_MOVE) { + FileUtils.moveFileToDirectory(srcFile, targetDir, false); + } else { + FileUtils.copyFileToDirectory(srcFile, targetDir); + } } } } @@ -220,59 +203,12 @@ logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } return result; - //return copyOrMoveFiles(fromPath, toPath, fileNames, OP_MOVE); } - - /** - * Dateien kopieren - * - * @param fromPath der relative Pfad, aus dem die Dateien stammen, die kopiert werden sollen - * @param toPath der relative Pfad, an den die Dateien kopiert werden sollen - * @param fileNames Liste mit Namen der Dateien, die kopiert werden sollen - * @param operation OP_COPY oder OP_MOVE - * @return null bei Fehler oder Quittungstext, wenn erfolgreich - */ - /* - private String copyOrMoveFiles(String fromPath, String toPath, List fileNames, int operation) { - String result = null; - try { - FileRef[] files = new FileRef[fileNames.size()]; - logger.fine(fileNames.toString()); - File srcDir = getTargetDir(fromPath); - for(int i=0; i < fileNames.size(); i++) { - Object o = fileNames.get(i); - if(o instanceof ArrayList) { - ArrayList al = (ArrayList) o; - logger.fine(al.get(0).toString()); - File srcFile = new File(srcDir, al.get(0).toString()); - logger.fine(srcFile.getAbsolutePath()); - files[i] = new FileRef(srcFile.getAbsolutePath(), srcFile.isDirectory()); - } - } - File targetDir = getTargetDir(toPath); - FileSystem fs = new LocalFileSystem(); - switch(operation) { - case OP_COPY: - fs.copy(files, new FileRef(targetDir.getAbsolutePath(), true)); - FileUtils.copy - break; - case OP_MOVE: - fs.move(files, new FileRef(targetDir.getAbsolutePath(), true)); - break; - } - result = "kopiert"; - } catch (Throwable ex) { - logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); - } - return result; - } - */ public FileRef saveTextFile(String relPath, String fileName, String contents) { FileRef savedFile = null; try { FileRef datenRef = getBase(); - //File daten = new File(datenRef.getAbsolutePath()); Object p = getRequest().getUserPrincipal(); if(p instanceof Principal) { File targetFile = new File(getTargetDir(relPath), fileName); @@ -341,40 +277,5 @@ userName = ((Principal) p).getName(); } return userName; - } - - /* - private File getWebappsDir() { - File cfile = new File(this.getClass().getResource( - this.getClass().getSimpleName() + ".class").getFile()); - String path = cfile.getAbsolutePath(); - return new File(path.substring(0, path.indexOf(getRequest().getContextPath()))); - } - */ - -} - - -/* - https://stackoverflow.com/questions/300559/move-copy-file-operations-in-java - - - -Try to use org.apache.commons.io.FileUtils (General file manipulation utilities). Facilities are provided in the following methods: - - (1) FileUtils.moveDirectory(File srcDir, File destDir) => Moves a directory. - - (2) FileUtils.moveDirectoryToDirectory(File src, File destDir, boolean createDestDir) => Moves a directory to another directory. - - (3) FileUtils.moveFile(File srcFile, File destFile) => Moves a file. - - (4) FileUtils.moveFileToDirectory(File srcFile, File destDir, boolean createDestDir) => Moves a file to a directory. - - (5) FileUtils.moveToDirectory(File src, File destDir, boolean createDestDir) => Moves a file or directory to the destination directory. - -It's simple, easy and fast. - - - https://commons.apache.org/proper/commons-io/javadocs/api-2.5/org/apache/commons/io/FileUtils.html - -*/ \ No newline at end of file + } +} \ No newline at end of file -- Gitblit v1.9.3