Author: vdegtyarev
Date: Fri Jan 29 05:12:12 2016
New Revision: 1727481
URL: http://svn.apache.org/viewvc?rev=1727481&view=rev
Log:
OPENMEETINGS-1320 minor changes and merge to trunk. Whiteboard saved and
restored correctly.
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1727481&r1=1727480&r2=1727481&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Fri Jan 29 05:12:12 2016
@@ -131,9 +131,7 @@ public class ConferenceLibrary implement
// +".xml";
// OwnerID == null
Long fileExplorerId = fileDao.add(fileName, "",
null,
- null, room_id, users_id, false,
// isFolder
- Type.WmlFile,
- localFileName, // WML
localFileName
+ null, room_id, users_id,
Type.WmlFile, localFileName, // WML localFileName
"", "");
return fileExplorerId;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1727481&r1=1727480&r2=1727481&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
Fri Jan 29 05:12:12 2016
@@ -46,7 +46,7 @@ public class FileExplorerItemDao {
private EntityManager em;
public Long add(String fileName, String fileHash, Long parentId, Long
ownerId, Long roomId, Long insertedBy,
- Boolean isFolder, Type type, String wmlFilePath, String
externalId, String externalType) {
+ Type type, String wmlFilePath, String externalId,
String externalType) {
log.debug(".add(): adding file " + fileName + " roomID: " +
roomId);
try {
FileExplorerItem fileItem = new FileExplorerItem();
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1727481&r1=1727480&r2=1727481&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Fri Jan 29 05:12:12 2016
@@ -38,6 +38,7 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.dto.file.LibraryPresentation;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
@@ -129,13 +130,9 @@ public class ConferenceLibrary implement
// String wmlPath = current_dir +
File.separatorChar+fileName
// +".xml";
// OwnerID == null
- Long fileExplorerId = fileDao.add(fileName, "",
0L,
- null, room_id, users_id, false,
// isFolder
- false, // isImage
- false, // isPresentation
- localFileName, // WML
localFileName
- true, // isStoredWML file
- true, "", "");
+ Long fileExplorerId = fileDao.add(fileName, "",
null,
+ null, room_id, users_id,
Type.WmlFile, localFileName, // WML localFileName
+ "", "");
return fileExplorerId;
}
@@ -183,7 +180,7 @@ public class ConferenceLibrary implement
whiteboardManagement.addWhiteBoardObjectById(room_id, whiteboardObjClear,
whiteboardId);
for (int k = 0; k < roomItems.size(); k++) {
- ArrayList actionObject = (ArrayList)
roomItems.get(k);
+ ArrayList actionObject =
(ArrayList)roomItems.get(k);
Map whiteboardObj = new HashMap();
whiteboardObj.put(2, "draw");
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1727481&r1=1727480&r2=1727481&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
Fri Jan 29 05:12:12 2016
@@ -46,8 +46,7 @@ public class FileExplorerItemDao {
private EntityManager em;
public Long add(String fileName, String fileHash, Long parentId, Long
ownerId, Long roomId, Long insertedBy,
- Boolean isFolder, Boolean isImage, Boolean
isPresentation, String wmlFilePath, Boolean isStoredWmlFile,
- Boolean isChart, String externalId, String
externalType) {
+ Type type, String wmlFilePath, String externalId,
String externalType) {
log.debug(".add(): adding file " + fileName + " roomID: " +
roomId);
try {
FileExplorerItem fileItem = new FileExplorerItem();
@@ -59,23 +58,7 @@ public class FileExplorerItemDao {
fileItem.setRoomId(roomId);
fileItem.setInserted(new Date());
fileItem.setInsertedBy(insertedBy);
- Type t = null;
- if (isStoredWmlFile) {
- t = Type.WmlFile;
- }
- if (isChart) {
- t = Type.PollChart;
- }
- if (isImage) {
- t = Type.Image;
- }
- if (isPresentation) {
- t = Type.Presentation;
- }
- if (isFolder) {
- t = Type.Folder;
- }
- fileItem.setType(t);
+ fileItem.setType(type);
fileItem.setUpdated(new Date());
fileItem.setWmlFilePath(wmlFilePath);
fileItem.setExternalId(externalId);
