Author: solomax
Date: Wed Jul 20 18:45:18 2016
New Revision: 1753597
URL: http://svn.apache.org/viewvc?rev=1753597&view=rev
Log:
[OPENMEETINGS-1030] more work of files section: files drop
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java?rev=1753597&r1=1753596&r2=1753597&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
Wed Jul 20 18:45:18 2016
@@ -49,6 +49,9 @@ public class RoomResourceReference exten
protected String getMimeType(FileExplorerItem r) {
String mime = null;
switch (r.getType()) {
+ case WmlFile:
+ mime = "application/xml";
+ break;
case Image:
mime = "image/jpeg";
break;
@@ -83,6 +86,10 @@ public class RoomResourceReference exten
protected File getFile(FileExplorerItem r, String ext) {
File result = null;
switch (r.getType()) {
+ case WmlFile: {
+ result = new
File(OmFileHelper.getUploadWmlDir(), String.format("%s.%s", r.getHash(), ext ==
null ? "wml" : ext));
+ }
+ break;
case Image: {
result = new
File(OmFileHelper.getUploadFilesDir(), String.format("%s.%s", r.getHash(), ext
== null ? "jpg" : ext));
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java?rev=1753597&r1=1753596&r2=1753597&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
Wed Jul 20 18:45:18 2016
@@ -49,6 +49,9 @@ public class RoomResourceReference exten
protected String getMimeType(FileExplorerItem r) {
String mime = null;
switch (r.getType()) {
+ case WmlFile:
+ mime = "application/xml";
+ break;
case Image:
mime = "image/jpeg";
break;
@@ -83,6 +86,10 @@ public class RoomResourceReference exten
protected File getFile(FileExplorerItem r, String ext) {
File result = null;
switch (r.getType()) {
+ case WmlFile: {
+ result = new
File(OmFileHelper.getUploadWmlDir(), String.format("%s.%s", r.getHash(), ext ==
null ? "wml" : ext));
+ }
+ break;
case Image: {
result = new
File(OmFileHelper.getUploadFilesDir(), String.format("%s.%s", r.getHash(), ext
== null ? "jpg" : ext));
}
