Author: solomax
Date: Sat Jan 14 07:52:07 2017
New Revision: 1778723
URL: http://svn.apache.org/viewvc?rev=1778723&view=rev
Log:
[OPENMEETINGS-1376] deleted files are displayed as expected
Removed:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/default/_thumb_deleted.jpg
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/default/deleted.xcf
openmeetings/application/trunk/openmeetings-web/src/main/webapp/default/_thumb_deleted.jpg
openmeetings/application/trunk/openmeetings-web/src/main/webapp/default/deleted.xcf
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/default/deleted.swf
openmeetings/application/trunk/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/sidebar/RoomSidebar.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/default/deleted.swf
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=1778723&r1=1778722&r2=1778723&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
Sat Jan 14 07:52:07 2017
@@ -19,8 +19,10 @@
package org.apache.openmeetings.web.room;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_SWF;
import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.getOmHome;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getOnlineClient;
@@ -28,6 +30,7 @@ import java.io.File;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.FileItemResourceReference;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -69,7 +72,7 @@ public class RoomResourceReference exten
}
return mime;
}
-
+
@Override
protected FileExplorerItem getFileItem(Attributes attributes) {
PageParameters params = attributes.getParameters();
@@ -92,14 +95,19 @@ public class RoomResourceReference exten
}
protected File getFile(FileExplorerItem f, String ext) {
- return f.getFile(ext);
+ File file = f.getFile(ext);
+ if (!file.exists()) {
+ file = new File(new File(getOmHome(), "default"),
String.format("deleted.%s"
+ , FileItem.Type.Image == f.getType() ?
EXTENSION_JPG : EXTENSION_SWF));
+ }
+ return file;
}
@Override
protected File getFile(FileExplorerItem f) {
return getFile(f, null);
}
-
+
@Override
protected String getFileName(FileExplorerItem f) {
return f.getFileName(preview ? EXTENSION_JPG : null);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1778723&r1=1778722&r2=1778723&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Sat Jan 14 07:52:07 2017
@@ -299,7 +299,7 @@ public class RoomSidebar extends Panel {
updateUsers();
selfRights.setVisible(room.getRoom().isAllowUserQuestions() ||
room.getClient().hasRight(Right.moderator));
selfRights.update(handler);
- handler.add(tabs);
+ tabs.reload(handler);
}
public void updateFiles(IPartialPageRequestHandler handler) {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java?rev=1778723&r1=1778722&r2=1778723&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
Sat Jan 14 07:52:07 2017
@@ -47,12 +47,12 @@ public abstract class FileItemResourceRe
private static final long serialVersionUID = 1L;
private File file;
private T r;
-
+
@Override
protected String getMimeType() throws IOException {
return
FileItemResourceReference.this.getMimeType(r);
}
-
+
@Override
protected ResourceResponse
newResourceResponse(Attributes attributes) {
r = getFileItem(attributes);
@@ -70,7 +70,7 @@ public abstract class FileItemResourceRe
}
};
}
-
+
protected abstract String getMimeType(T r);
protected abstract String getFileName(T r);
protected abstract File getFile(T r);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/default/deleted.swf
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/default/deleted.swf?rev=1778723&r1=1778722&r2=1778723&view=diff
==============================================================================
Binary files - no diff available.
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=1778723&r1=1778722&r2=1778723&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
Sat Jan 14 07:52:07 2017
@@ -19,8 +19,10 @@
package org.apache.openmeetings.web.room;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_SWF;
import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.getOmHome;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getOnlineClient;
@@ -28,6 +30,7 @@ import java.io.File;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.FileItemResourceReference;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -69,7 +72,7 @@ public class RoomResourceReference exten
}
return mime;
}
-
+
@Override
protected FileExplorerItem getFileItem(Attributes attributes) {
PageParameters params = attributes.getParameters();
@@ -92,14 +95,19 @@ public class RoomResourceReference exten
}
protected File getFile(FileExplorerItem f, String ext) {
- return f.getFile(ext);
+ File file = f.getFile(ext);
+ if (!file.exists()) {
+ file = new File(new File(getOmHome(), "default"),
String.format("deleted.%s"
+ , FileItem.Type.Image == f.getType() ?
EXTENSION_JPG : EXTENSION_SWF));
+ }
+ return file;
}
@Override
protected File getFile(FileExplorerItem f) {
return getFile(f, null);
}
-
+
@Override
protected String getFileName(FileExplorerItem f) {
return f.getFileName(preview ? EXTENSION_JPG : null);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1778723&r1=1778722&r2=1778723&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Sat Jan 14 07:52:07 2017
@@ -299,7 +299,7 @@ public class RoomSidebar extends Panel {
updateUsers();
selfRights.setVisible(room.getRoom().isAllowUserQuestions() ||
room.getClient().hasRight(Right.moderator));
selfRights.update(handler);
- handler.add(tabs);
+ tabs.reload(handler);
}
public void updateFiles(IPartialPageRequestHandler handler) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java?rev=1778723&r1=1778722&r2=1778723&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
Sat Jan 14 07:52:07 2017
@@ -47,12 +47,12 @@ public abstract class FileItemResourceRe
private static final long serialVersionUID = 1L;
private File file;
private T r;
-
+
@Override
protected String getMimeType() throws IOException {
return
FileItemResourceReference.this.getMimeType(r);
}
-
+
@Override
protected ResourceResponse
newResourceResponse(Attributes attributes) {
r = getFileItem(attributes);
@@ -70,7 +70,7 @@ public abstract class FileItemResourceRe
}
};
}
-
+
protected abstract String getMimeType(T r);
protected abstract String getFileName(T r);
protected abstract File getFile(T r);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/default/deleted.swf
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/default/deleted.swf?rev=1778723&r1=1778722&r2=1778723&view=diff
==============================================================================
Binary files - no diff available.
