diff --git a/src/main/java/org/olat/fileresource/FileDetailsForm.java b/src/main/java/org/olat/fileresource/FileDetailsForm.java deleted file mode 100644 index b75d3548b9af84322f37d64dd01ba04c3089e1eb..0000000000000000000000000000000000000000 --- a/src/main/java/org/olat/fileresource/FileDetailsForm.java +++ /dev/null @@ -1,149 +0,0 @@ -/** -* OLAT - Online Learning and Training<br> -* http://www.olat.org -* <p> -* Licensed under the Apache License, Version 2.0 (the "License"); <br> -* you may not use this file except in compliance with the License.<br> -* You may obtain a copy of the License at -* <p> -* http://www.apache.org/licenses/LICENSE-2.0 -* <p> -* Unless required by applicable law or agreed to in writing,<br> -* software distributed under the License is distributed on an "AS IS" BASIS, <br> -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br> -* See the License for the specific language governing permissions and <br> -* limitations under the License. -* <p> -* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br> -* University of Zurich, Switzerland. -* <hr> -* <a href="http://www.openolat.org"> -* OpenOLAT - Online Learning and Training</a><br> -* This file has been modified by the OpenOLAT community. Changes are licensed -* under the Apache 2.0 license as the original file. -*/ - -package org.olat.fileresource; - -import java.io.File; -import java.text.DateFormat; -import java.util.Date; -import java.util.List; - -import org.dom4j.Document; -import org.dom4j.Element; -import org.olat.core.gui.UserRequest; -import org.olat.core.gui.components.form.flexible.FormItemContainer; -import org.olat.core.gui.components.form.flexible.impl.FormBasicController; -import org.olat.core.gui.control.Controller; -import org.olat.core.gui.control.WindowControl; - -import org.olat.core.id.OLATResourceable; -import org.olat.core.util.vfs.LocalFileImpl; -import org.olat.core.util.vfs.LocalFolderImpl; -import org.olat.core.util.vfs.VFSContainer; -import org.olat.core.util.vfs.VFSItem; -import org.olat.fileresource.types.ImsCPFileResource; -import org.olat.fileresource.types.ScormCPFileResource; -import org.olat.ims.qti.fileresource.SurveyFileResource; -import org.olat.ims.qti.fileresource.TestFileResource; -import org.olat.ims.qti.process.QTIHelper; - -/** - * Initial Date: Apr 19, 2004 - * - * @author Mike Stock - * - */ -public class FileDetailsForm extends FormBasicController { - - private OLATResourceable res; - private File file; - - /** - * Create details form with values from resourceable res. - * @param name - * @param locale - * @param res - */ - public FileDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res) { - super(ureq, wControl); - this.res = res; - file = FileResourceManager.getInstance().getFileResource(res); - initForm (ureq); - } - - @Override - protected void formOK(UserRequest ureq) { - // - } - - @Override - protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) { - uifactory.addStaticTextElement("size", "fr.size", new Long(file.length() / 1024).toString() + " KB", formLayout); - DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, getLocale()); - uifactory.addStaticTextElement("last", "fr.last", df.format(new Date(file.lastModified())), formLayout); - - String resType = res.getResourceableTypeName(); - if (resType.equals(TestFileResource.TYPE_NAME) || resType.equals(SurveyFileResource.TYPE_NAME)) { - - FileResourceManager frm = FileResourceManager.getInstance(); - File unzippedRoot = frm.unzipFileResource(res); - - - //with VFS FIXME:pb:c: remove casts to LocalFileImpl and LocalFolderImpl if no longer needed. - VFSContainer vfsUnzippedRoot = new LocalFolderImpl(unzippedRoot); - VFSItem vfsQTI = vfsUnzippedRoot.resolve("qti.xml"); - //getDocument(..) ensures that InputStream is closed in every case. - Document doc = QTIHelper.getDocument((LocalFileImpl) vfsQTI); - //if doc is null an error loading the document occured (IOException, qti.xml does not exist) - if (doc != null) { - - // extract title - Element el_assess = (Element)doc.selectSingleNode("questestinterop/assessment"); - String title = el_assess.attributeValue("title"); - uifactory.addStaticTextElement("title", "qti.title", title==null?"-":title, formLayout); - - - // extract objectives - //HTMLTextAreaElement htmlTA = new HTMLTextAreaElement("qti.objectives", 10, 60); - //htmlTA.setReadOnly(true); - - String obj = "-"; - Element el_objectives = (Element)doc.selectSingleNode("//questestinterop/assessment/objectives"); - if (el_objectives != null) { - Element el_mat = (Element)el_objectives.selectSingleNode("material/mattext"); - if (el_mat != null) { - obj = el_mat.getTextTrim(); - } - } - uifactory.addStaticTextElement("obj", "qti.objectives", obj, formLayout); - - // extract num of questions - List items = doc.selectNodes("//item"); - uifactory.addStaticTextElement("qti.questions", "qti.questions", items.size()>0?""+items.size():"-", formLayout); - - // extract time limit - String tl = "-"; - Element el_duration = (Element)el_assess.selectSingleNode("duration"); - if (el_duration != null) { - long dur = QTIHelper.parseISODuration(el_duration.getTextTrim()); - long min = dur / 1024 / 60; - long sec = (dur - (min * 60 * 1024)) / 1024; - tl = "" + min + "' " + sec + "''"; - } - uifactory.addStaticTextElement("qti.timelimit", "qti.timelimit", tl, formLayout); - } - } else if (resType.equals(ImsCPFileResource.TYPE_NAME) || resType.equals(ScormCPFileResource.TYPE_NAME)) { - // - } - - flc.setEnabled(false); - } - - @Override - protected void doDispose() { - // - } - -} diff --git a/src/main/java/org/olat/fileresource/FileResourceManager.java b/src/main/java/org/olat/fileresource/FileResourceManager.java index c7e105b5eb57625b6467ccf01fcf7dd45b535166..184628703f222dda139c4f07af6e80c644bd5948 100644 --- a/src/main/java/org/olat/fileresource/FileResourceManager.java +++ b/src/main/java/org/olat/fileresource/FileResourceManager.java @@ -29,9 +29,6 @@ import java.io.File; import org.olat.core.commons.modules.bc.FolderConfig; import org.olat.core.commons.modules.bc.vfs.OlatRootFolderImpl; -import org.olat.core.gui.UserRequest; -import org.olat.core.gui.control.Controller; -import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.media.MediaResource; import org.olat.core.id.OLATResourceable; import org.olat.core.logging.OLATRuntimeException; @@ -265,14 +262,6 @@ public class FileResourceManager extends BasicManager { return FileUtils.deleteDirsAndFiles(zipTargetDir, true, true); } - /** - * @param res - * @return FormBasicController - */ - public Controller getDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res) { - return new FileDetailsForm(ureq, wControl, res); - } - private FileResource getAsGenericFileResource(OLATResourceable res) { FileResource fr = new FileResource(); fr.overrideResourceableId(res.getResourceableId()); diff --git a/src/main/java/org/olat/repository/handlers/BlogHandler.java b/src/main/java/org/olat/repository/handlers/BlogHandler.java index f9181d128c7b07d8e9c3b03affb439365a15061a..32328c00f5df698ec0dd75a833c39affc9334aa7 100644 --- a/src/main/java/org/olat/repository/handlers/BlogHandler.java +++ b/src/main/java/org/olat/repository/handlers/BlogHandler.java @@ -158,11 +158,6 @@ public class BlogHandler implements RepositoryHandler { .getFileResourceMedia(repoEntry.getOlatResource()); } - @Override - public Controller createDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res) { - return FileResourceManager.getInstance().getDetailsForm(ureq, wControl, res); - } - @Override public Controller createEditorController(RepositoryEntry re, UserRequest ureq, WindowControl control, TooledStackedPanel toolbar) { return null; diff --git a/src/main/java/org/olat/repository/handlers/CourseHandler.java b/src/main/java/org/olat/repository/handlers/CourseHandler.java index adfc5c5534e2e82478369ebf88e891050a4a0eed..1f2f0305ff44d89ab240f3555dc6ba8d7b1f4fb9 100644 --- a/src/main/java/org/olat/repository/handlers/CourseHandler.java +++ b/src/main/java/org/olat/repository/handlers/CourseHandler.java @@ -494,11 +494,6 @@ public class CourseHandler implements RepositoryHandler { return ccSMRC; } - @Override - public Controller createDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res) { - return null; - } - @Override public boolean cleanupOnDelete(OLATResourceable res) { // notify all current users of this resource (course) that it will be deleted now. diff --git a/src/main/java/org/olat/repository/handlers/FileHandler.java b/src/main/java/org/olat/repository/handlers/FileHandler.java index 473684a263b239a613a47045c0c6353b199aebb7..e36108471a7e8b231de27e06843616032097f203 100644 --- a/src/main/java/org/olat/repository/handlers/FileHandler.java +++ b/src/main/java/org/olat/repository/handlers/FileHandler.java @@ -28,9 +28,6 @@ package org.olat.repository.handlers; import java.io.File; import java.util.Locale; -import org.olat.core.gui.UserRequest; -import org.olat.core.gui.control.Controller; -import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.media.MediaResource; import org.olat.core.gui.translator.Translator; import org.olat.core.id.Identity; @@ -62,11 +59,6 @@ public abstract class FileHandler implements RepositoryHandler { public MediaResource getAsMediaResource(OLATResourceable res, boolean backwardsCompatible) { return FileResourceManager.getInstance().getAsDownloadeableMediaResource(res); } - - @Override - public Controller createDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res) { - return FileResourceManager.getInstance().getDetailsForm(ureq, wControl, res); - } @Override public VFSContainer getMediaContainer(RepositoryEntry repoEntry) { diff --git a/src/main/java/org/olat/repository/handlers/GlossaryHandler.java b/src/main/java/org/olat/repository/handlers/GlossaryHandler.java index a629dc19220c35265007d722475891a46b09aacc..61bcf52828fcc4f7771e06b1c784c4cbe1968eb5 100644 --- a/src/main/java/org/olat/repository/handlers/GlossaryHandler.java +++ b/src/main/java/org/olat/repository/handlers/GlossaryHandler.java @@ -223,11 +223,6 @@ public class GlossaryHandler implements RepositoryHandler { return layoutCtr; } - @Override - public Controller createDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res) { - return null; - } - @Override public boolean cleanupOnDelete(OLATResourceable res) { // FIXME fg diff --git a/src/main/java/org/olat/repository/handlers/PodcastHandler.java b/src/main/java/org/olat/repository/handlers/PodcastHandler.java index 07d875e05089c60c9f8c3a527c0c681944ddf123..5cbd071e5471a47e1da223ace86900bd25ac3ac6 100644 --- a/src/main/java/org/olat/repository/handlers/PodcastHandler.java +++ b/src/main/java/org/olat/repository/handlers/PodcastHandler.java @@ -158,11 +158,6 @@ public class PodcastHandler implements RepositoryHandler { return manager.getFeedArchiveMediaResource(res); } - @Override - public Controller createDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res) { - return FileResourceManager.getInstance().getDetailsForm(ureq, wControl, res); - } - @Override public Controller createEditorController(RepositoryEntry re, UserRequest ureq, WindowControl control, TooledStackedPanel toolbar) { return null; diff --git a/src/main/java/org/olat/repository/handlers/PortfolioHandler.java b/src/main/java/org/olat/repository/handlers/PortfolioHandler.java index a08ab6269bf4e9ac277d0eb71fbfc3aba759974e..8e640d14c0d24ade4629e3f9013954aed99fd212 100644 --- a/src/main/java/org/olat/repository/handlers/PortfolioHandler.java +++ b/src/main/java/org/olat/repository/handlers/PortfolioHandler.java @@ -226,11 +226,6 @@ public class PortfolioHandler implements RepositoryHandler { return mr; } - @Override - public Controller createDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res) { - return null; - } - @Override public Controller createEditorController(RepositoryEntry re, UserRequest ureq, WindowControl control, TooledStackedPanel toolbar) { return null; diff --git a/src/main/java/org/olat/repository/handlers/RepositoryHandler.java b/src/main/java/org/olat/repository/handlers/RepositoryHandler.java index 33ff1a08cfc7e025e8202b25521f5c3b40f88ff4..ea2ddcd092743bb469548c87b9f45ce583f0f04a 100644 --- a/src/main/java/org/olat/repository/handlers/RepositoryHandler.java +++ b/src/main/java/org/olat/repository/handlers/RepositoryHandler.java @@ -189,23 +189,13 @@ public interface RepositoryHandler { * this method returns false, the entry will not be deleted. * @param res * @param identity - * @param roles TODO - * @param locale TODO + * @param roles + * @param locale * @param errors * @return true if ressource is ready to delete, false if not. */ public boolean readyToDelete(OLATResourceable res, Identity identity, Roles roles, Locale locale, ErrorList errors); - /** - * If a handler likes to provied any details on a resourceable in the repository's details - * view, he may do so by providing a component that renders the details. - * - * @param ureq - * @param wControl - * @param res - * @return Controller displaying details or null, if no details are available. - */ - public Controller createDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res); public String archive(Identity archiveOnBehalfOf, String archivFilePath, RepositoryEntry repoEntry); diff --git a/src/main/java/org/olat/repository/handlers/SharedFolderHandler.java b/src/main/java/org/olat/repository/handlers/SharedFolderHandler.java index cf463a4e0eff092cf572c6bde4bd36864a94d873..38b03025852763fe82403e547b4f43c62d452ac9 100644 --- a/src/main/java/org/olat/repository/handlers/SharedFolderHandler.java +++ b/src/main/java/org/olat/repository/handlers/SharedFolderHandler.java @@ -204,11 +204,6 @@ public class SharedFolderHandler implements RepositoryHandler { return layoutCtr; } - @Override - public Controller createDetailsForm(UserRequest ureq, WindowControl wControl, OLATResourceable res) { - return null; - } - @Override public boolean cleanupOnDelete(OLATResourceable res) { // do not need to notify all current users of this resource, since the only diff --git a/src/main/java/org/olat/repository/handlers/WikiHandler.java b/src/main/java/org/olat/repository/handlers/WikiHandler.java index e9e2d1c29d1c98bfbab77586db1076ccfe56a71d..b09d508d05154263d094d9c2082c6bf67ddb0ad7 100644 --- a/src/main/java/org/olat/repository/handlers/WikiHandler.java +++ b/src/main/java/org/olat/repository/handlers/WikiHandler.java @@ -299,11 +299,6 @@ public class WikiHandler implements RepositoryHandler { return true; } - @Override - public Controller createDetailsForm( UserRequest ureq, WindowControl wControl, OLATResourceable res) { - return FileResourceManager.getInstance().getDetailsForm(ureq, wControl, res); - } - @Override public String archive(Identity archiveOnBehalfOf, String archivFilePath, RepositoryEntry repoEntry) { VFSContainer rootContainer = FileResourceManager.getInstance().getFileResourceRootImpl(repoEntry.getOlatResource());