Author: solomax
Date: Wed Nov 25 14:53:32 2015
New Revision: 1716429
URL: http://svn.apache.org/viewvc?rev=1716429&view=rev
Log:
[OPENMEETINGS-1118] fileItemDTO is improved
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java?rev=1716429&r1=1716428&r2=1716429&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java
Wed Nov 25 14:53:32 2015
@@ -41,36 +41,45 @@ public class FileExplorerItemDTO impleme
private static final long serialVersionUID = 1L;
private Long id;
private String name;
+ private String hash;
private Long parentId;
private Long roomId;
private Long size;
private String externalId;
private String externalType;
private Type type;
+ private Integer flvWidth;
+ private Integer flvHeight;
public FileExplorerItemDTO() {}
public FileExplorerItemDTO(FileExplorerItem f) {
id = f.getId();
name = f.getName();
+ hash = f.getHash();
parentId = f.getParentId();
roomId = f.getRoomId();
size = f.getSize();
externalId = f.getExternalId();
externalType = f.getExternalType();
type = f.getType();
+ flvWidth = f.getFlvWidth();
+ flvHeight = f.getFlvHeight();
}
public FileExplorerItem get() {
FileExplorerItem f = new FileExplorerItem();
f.setId(id);
f.setName(name);
+ f.setHash(hash);
f.setParentId(parentId);
f.setRoomId(roomId);
f.setSize(size);
f.setExternalId(externalId);
f.setExternalType(externalType);
f.setType(type);
+ f.setFlvWidth(flvWidth);
+ f.setFlvHeight(flvHeight);
return f;
}
@@ -81,12 +90,21 @@ public class FileExplorerItemDTO impleme
public void setId(Long id) {
this.id = id;
}
+
public String getName() {
return name;
}
- public void setName(String fileName) {
- this.name = fileName;
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getHash() {
+ return hash;
+ }
+
+ public void setHash(String hash) {
+ this.hash = hash;
}
public Long getParentId() {
@@ -137,6 +155,22 @@ public class FileExplorerItemDTO impleme
this.type = type;
}
+ public Integer getFlvWidth() {
+ return flvWidth;
+ }
+
+ public void setFlvWidth(Integer flvWidth) {
+ this.flvWidth = flvWidth;
+ }
+
+ public Integer getFlvHeight() {
+ return flvHeight;
+ }
+
+ public void setFlvHeight(Integer flvHeight) {
+ this.flvHeight = flvHeight;
+ }
+
public static List<FileExplorerItemDTO> list(List<FileExplorerItem> l) {
List<FileExplorerItemDTO> list = new ArrayList<>();
if (l != null) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java?rev=1716429&r1=1716428&r2=1716429&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/file/FileExplorerItemDTO.java
Wed Nov 25 14:53:32 2015
@@ -41,36 +41,45 @@ public class FileExplorerItemDTO impleme
private static final long serialVersionUID = 1L;
private Long id;
private String name;
+ private String hash;
private Long parentId;
private Long roomId;
private Long size;
private String externalId;
private String externalType;
private Type type;
+ private Integer flvWidth;
+ private Integer flvHeight;
public FileExplorerItemDTO() {}
public FileExplorerItemDTO(FileExplorerItem f) {
id = f.getId();
name = f.getName();
+ hash = f.getHash();
parentId = f.getParentId();
roomId = f.getRoomId();
size = f.getSize();
externalId = f.getExternalId();
externalType = f.getExternalType();
type = f.getType();
+ flvWidth = f.getFlvWidth();
+ flvHeight = f.getFlvHeight();
}
public FileExplorerItem get() {
FileExplorerItem f = new FileExplorerItem();
f.setId(id);
f.setName(name);
+ f.setHash(hash);
f.setParentId(parentId);
f.setRoomId(roomId);
f.setSize(size);
f.setExternalId(externalId);
f.setExternalType(externalType);
f.setType(type);
+ f.setFlvWidth(flvWidth);
+ f.setFlvHeight(flvHeight);
return f;
}
@@ -81,12 +90,21 @@ public class FileExplorerItemDTO impleme
public void setId(Long id) {
this.id = id;
}
+
public String getName() {
return name;
}
- public void setName(String fileName) {
- this.name = fileName;
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getHash() {
+ return hash;
+ }
+
+ public void setHash(String hash) {
+ this.hash = hash;
}
public Long getParentId() {
@@ -137,6 +155,22 @@ public class FileExplorerItemDTO impleme
this.type = type;
}
+ public Integer getFlvWidth() {
+ return flvWidth;
+ }
+
+ public void setFlvWidth(Integer flvWidth) {
+ this.flvWidth = flvWidth;
+ }
+
+ public Integer getFlvHeight() {
+ return flvHeight;
+ }
+
+ public void setFlvHeight(Integer flvHeight) {
+ this.flvHeight = flvHeight;
+ }
+
public static List<FileExplorerItemDTO> list(List<FileExplorerItem> l) {
List<FileExplorerItemDTO> list = new ArrayList<>();
if (l != null) {
