Revision: 3917
Author: seba.wagner
Date: Fri Jul 1 00:47:55 2011
Log: [No log message]
http://code.google.com/p/openmeetings/source/detail?r=3917
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/utils/StoredFile.java
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
=======================================
--- /trunk/singlewebapp/src/app/org/openmeetings/utils/StoredFile.java Mon
May 30 13:39:45 2011
+++ /trunk/singlewebapp/src/app/org/openmeetings/utils/StoredFile.java Fri
Jul 1 00:47:55 2011
@@ -43,6 +43,29 @@
this.name = name;
this.ext = ext;
}
+
+ public static String[] getExtensions(){
+
+ Set<String> extensions = new HashSet<String>();
+ extensions.addAll(convertExtensions);
+ extensions.addAll(pdfExtensions);
+ extensions.addAll(imageExtensions);
+ extensions.addAll(chartExtensions);
+ extensions.addAll(videoExtensions);
+ extensions.addAll(asIsExtensions);
+
+ Object[] returnObj = extensions.toArray();
+
+ String[] returnStr = new String[returnObj.length];
+
+ int i=0;
+ for (Object obj : returnObj) {
+ returnStr[i] = obj.toString();
+ i++;
+ }
+
+ return returnStr;
+ }
public boolean isConvertable() {
return convertExtensions.contains(ext);
=======================================
---
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
Fri Jul 1 00:15:29 2011
+++
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
Fri Jul 1 00:47:55 2011
@@ -28,6 +28,7 @@
import org.openmeetings.app.hibernate.beans.user.Users;
import org.openmeetings.app.remote.ConferenceLibrary;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.utils.StoredFile;
import javax.servlet.ServletContext;
import javax.xml.stream.XMLStreamException;
@@ -410,11 +411,16 @@
return null;
}
- public String[] getImportFileExtensions() throws AxisFault {
-
-
- return null;
- }
+ public String[] getImportFileExtensions() throws AxisFault {
+ try {
+
+ return StoredFile.getExtensions();
+
+ } catch (Exception err) {
+ log.error("[getImportFileExtensions]",err);
+ }
+ return null;
+ }
/**
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.