Revision: 3950
Author: seba.wagner
Date: Sun Jul 3 11:03:54 2011
Log: Refactor some of the File-Explorer API Calls
http://code.google.com/p/openmeetings/source/detail?r=3950
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dto/FileExplorerObject.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
Sun Jun 26 04:31:31 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
Sun Jul 3 11:03:54 2011
@@ -134,7 +134,7 @@
return null;
}
- public List<FileExplorerItem> getFileExplorerItemsByRoom(Long room_id,
+ public FileExplorerItem[] getFileExplorerItemsByRoom(Long room_id,
Long parentFileExplorerItemId) {
log.debug(".getFileExplorerItemsByRoom() started");
try {
@@ -154,7 +154,7 @@
query.setLong("room_id", room_id);
query.setLong("parentFileExplorerItemId",
parentFileExplorerItemId);
- List<FileExplorerItem> fileExplorerList = query.list();
+ FileExplorerItem[] fileExplorerList = (FileExplorerItem[])
query.list().toArray(new FileExplorerItem[0]);
tx.commit();
HibernateUtil.closeSession(idf);
@@ -167,7 +167,7 @@
return null;
}
- public List<FileExplorerItem> getFileExplorerItemsByOwner(Long ownerId,
+ public FileExplorerItem[] getFileExplorerItemsByOwner(Long ownerId,
Long parentFileExplorerItemId) {
log.debug(".getFileExplorerItemsByOwner() started");
try {
@@ -186,7 +186,7 @@
query.setLong("ownerId", ownerId);
query.setLong("parentFileExplorerItemId",
parentFileExplorerItemId);
- List<FileExplorerItem> fileExplorerList = query.list();
+ FileExplorerItem[] fileExplorerList = (FileExplorerItem[])
query.list().toArray(new FileExplorerItem[0]);
tx.commit();
HibernateUtil.closeSession(idf);
@@ -199,7 +199,7 @@
return null;
}
- public List<FileExplorerItem> getFileExplorerItemsByParent(
+ public FileExplorerItem[] getFileExplorerItemsByParent(
Long parentFileExplorerItemId) {
log.debug(".getFileExplorerItemsByParent() started");
try {
@@ -216,7 +216,7 @@
query.setString("deleted", "true");
query.setLong("parentFileExplorerItemId",
parentFileExplorerItemId);
- List<FileExplorerItem> fileExplorerList = query.list();
+ FileExplorerItem[] fileExplorerList = (FileExplorerItem[])
query.list().toArray(new FileExplorerItem[0]);
tx.commit();
HibernateUtil.closeSession(idf);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dto/FileExplorerObject.java
Sun Jul 3 04:58:24 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dto/FileExplorerObject.java
Sun Jul 3 11:03:54 2011
@@ -10,21 +10,21 @@
*/
public class FileExplorerObject {
- private List<FileExplorerItem> userHome;
- private List<FileExplorerItem> roomHome;
+ private FileExplorerItem[] userHome;
+ private FileExplorerItem[] roomHome;
private Long userHomeSize;
private Long roomHomeSize;
- public List<FileExplorerItem> getUserHome() {
+ public FileExplorerItem[] getUserHome() {
return userHome;
}
- public void setUserHome(List<FileExplorerItem> userHome) {
+ public void setUserHome(FileExplorerItem[] userHome) {
this.userHome = userHome;
}
- public List<FileExplorerItem> getRoomHome() {
+ public FileExplorerItem[] getRoomHome() {
return roomHome;
}
- public void setRoomHome(List<FileExplorerItem> roomHome) {
+ public void setRoomHome(FileExplorerItem[] roomHome) {
this.roomHome = roomHome;
}
public Long getUserHomeSize() {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
Sun Jul 3 08:43:32 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
Sun Jul 3 11:03:54 2011
@@ -169,7 +169,7 @@
FileExplorerItemDaoImpl.getInstance().updateFileOrFolder(
fileExplorerItem);
- List<FileExplorerItem> childElements = FileExplorerItemDaoImpl
+ FileExplorerItem[] childElements = FileExplorerItemDaoImpl
.getInstance().getFileExplorerItemsByParent(
fileExplorerItem.getFileExplorerItemId());
@@ -277,6 +277,16 @@
return null;
}
+ /**
+ *
+ * Save an Object to the library and returns the file-explorer Id
+ *
+ * @param SID
+ * @param room_id
+ * @param fileName
+ * @param tObjectRef
+ * @return
+ */
public Long saveAsObject(String SID, Long room_id, String fileName,
Object tObjectRef) {
try {
@@ -324,6 +334,15 @@
return -1L;
}
+ /**
+ *
+ * Loads a Object from the library into the whiteboard of all
participant of the current room
+ *
+ * @param SID
+ * @param room_id
+ * @param fileExplorerItemId
+ * @param whiteboardId
+ */
public void loadWmlObject(String SID, Long room_id, Long
fileExplorerItemId, Long whiteboardId) {
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
@@ -399,6 +418,15 @@
}
}
+ /**
+ *
+ * Loads a chart object
+ *
+ * @param SID
+ * @param room_id
+ * @param fileName
+ * @return
+ */
public ArrayList loadChartObject(String SID, Long room_id, String
fileName) {
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
@@ -415,11 +443,19 @@
fileName);
}
} catch (Exception err) {
- log.error("[saveAsImage] ", err);
+ log.error("[loadChartObject] ", err);
}
return null;
}
+ /**
+ *
+ * Load all objects of a conference room
+ *
+ * @param SID
+ * @param room_id
+ * @return
+ */
public FileExplorerObject getFileExplorerByRoom(String SID, Long
room_id) {
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
@@ -432,7 +468,7 @@
FileExplorerObject fileExplorerObject = new
FileExplorerObject();
// Home File List
- List<FileExplorerItem> fList = FileExplorerItemDaoImpl
+ FileExplorerItem[] fList = FileExplorerItemDaoImpl
.getInstance()
.getFileExplorerItemsByOwner(users_id, 0L);
@@ -449,7 +485,7 @@
fileExplorerObject.setUserHomeSize(homeFileSize);
// Public File List
- List<FileExplorerItem> rList = FileExplorerItemDaoImpl
+ FileExplorerItem[] rList = FileExplorerItemDaoImpl
.getInstance().getFileExplorerItemsByRoom(room_id,
0L);
long roomFileSize = 0;
@@ -473,7 +509,7 @@
return null;
}
- public List<FileExplorerItem> getFileExplorerByParent(String SID,
+ public FileExplorerItem[] getFileExplorerByParent(String SID,
Long parentFileExplorerItemId, Long room_id, Boolean isOwner) {
try {
Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
@@ -638,7 +674,7 @@
FileExplorerItemDaoImpl.getInstance().updateFileOrFolder(
fileExplorerItem);
- List<FileExplorerItem> childElements = FileExplorerItemDaoImpl
+ FileExplorerItem[] childElements = FileExplorerItemDaoImpl
.getInstance().getFileExplorerItemsByParent(
fileExplorerItem.getFileExplorerItemId());
=======================================
---
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
Sun Jul 3 08:28:03 2011
+++
/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileService.java
Sun Jul 3 11:03:54 2011
@@ -464,58 +464,6 @@
}
}
-
-
- /**
- * this Method does not work yet,
- * as the Result has to be rewritten in Objects instead
- * of a LinekdHashMap
- * @deprecated
- * @param SID
- * @param moduleName
- * @param parentFolder
- * @param room
- * @param domain
- * @return
- */
- public LiberaryObject getListOfFiles(String SID, String moduleName,
- String parentFolder, Long room_id ) {
- try {
- log.debug("#############current_dir : "+"");
-
- log.debug("#############SID : "+SID);
- log.debug("#############moduleName : "+moduleName);
- log.debug("#############parentFolder : "+parentFolder);
- log.debug("#############room_id : "+room_id);
-
- return
ConferenceLibrary.getInstance().getListOfFilesObjectByAbsolutePath(SID,
moduleName, parentFolder, room_id);
-
-
- } catch (Exception err) {
- log.error("[getListOfFiles]",err);
- }
- return null;
- }
-
- /**
- * @deprecated
- * @param SID
- * @param fileName
- * @param moduleName
- * @param parentFolder
- * @param room_id
- * @return
- */
- public Boolean deleteFile(String SID, String fileName, String moduleName,
String parentFolder, Long room_id){
- try {
- return ConferenceLibrary.getInstance().deleteFile(SID, fileName,
moduleName, parentFolder, room_id);
- } catch (Exception err) {
- log.error("[deleteFile]",err);
- }
- return null;
- }
-
- //public addFile(String SID, String url, Long parentFolderId, )
public TestObject getTestObject(){
TestObject textO = new TestObject();
--
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.
