Author: solomax
Date: Thu Aug 11 11:10:38 2016
New Revision: 1755937
URL: http://svn.apache.org/viewvc?rev=1755937&view=rev
Log:
[OPENMEETINGS-1030] typos and compilation errors are fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?rev=1755937&r1=1755936&r2=1755937&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
Thu Aug 11 11:10:38 2016
@@ -28,6 +28,9 @@ import java.io.File;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@@ -56,6 +59,12 @@ import org.simpleframework.xml.Root;
public class FileExplorerItem extends FileItem {
private static final long serialVersionUID = 1L;
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ @Element(data = true, name = "fileExplorerItemId")
+ private Long id;
+
@Column(name = "filesize")
@Element(data = true, required = false)
private Long size;
@@ -66,6 +75,16 @@ public class FileExplorerItem extends Fi
@Column(name = "external_type")
private String externalType;
+ @Override
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public Long getSize() {
return size;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java?rev=1755937&r1=1755936&r2=1755937&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
Thu Aug 11 11:10:38 2016
@@ -24,9 +24,6 @@ import java.util.Date;
import javax.persistence.Column;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import javax.xml.bind.annotation.XmlType;
@@ -43,12 +40,6 @@ public abstract class FileItem implement
Folder, Image, PollChart, Presentation, Recording, Video,
WmlFile
}
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "id")
- @Element(data = true, name = "flvRecordingId")
- private Long id;
-
@Column(name = "name")
@Element(name = "fileName", data = true, required = false)
private String name;
@@ -104,16 +95,6 @@ public abstract class FileItem implement
@Enumerated(EnumType.STRING)
private Type type;
- @Override
- public Long getId() {
- return id;
- }
-
- @Override
- public void setId(Long id) {
- this.id = id;
- }
-
public String getName() {
return name;
}
@@ -233,7 +214,7 @@ public abstract class FileItem implement
}
public final boolean exists(String ext) {
- if (id != null && !isDeleted()) {
+ if (getId() != null && !isDeleted()) {
File f = getFile(ext);
return f != null && f.exists() && f.isFile();
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1755937&r1=1755936&r2=1755937&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
Thu Aug 11 11:10:38 2016
@@ -35,6 +35,9 @@ import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
@@ -110,6 +113,12 @@ public class Recording extends FileItem
, ERROR
}
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ @Element(data = true, name = "flvRecordingId")
+ private Long id;
+
@Column(name = "alternate_download")
@Element(data = true, required = false)
private String alternateDownload;
@@ -168,6 +177,16 @@ public class Recording extends FileItem
@Transient
private List<RecordingLog> log;
+ @Override
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public String getComment() {
return comment;
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?rev=1755937&r1=1755936&r2=1755937&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
Thu Aug 11 11:10:38 2016
@@ -28,6 +28,9 @@ import java.io.File;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
@@ -56,6 +59,12 @@ import org.simpleframework.xml.Root;
public class FileExplorerItem extends FileItem {
private static final long serialVersionUID = 1L;
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ @Element(data = true, name = "fileExplorerItemId")
+ private Long id;
+
@Column(name = "filesize")
@Element(data = true, required = false)
private Long size;
@@ -66,6 +75,16 @@ public class FileExplorerItem extends Fi
@Column(name = "external_type")
private String externalType;
+ @Override
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public Long getSize() {
return size;
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java?rev=1755937&r1=1755936&r2=1755937&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
Thu Aug 11 11:10:38 2016
@@ -24,9 +24,6 @@ import java.util.Date;
import javax.persistence.Column;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import javax.xml.bind.annotation.XmlType;
@@ -43,12 +40,6 @@ public abstract class FileItem implement
Folder, Image, PollChart, Presentation, Recording, Video,
WmlFile
}
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "id")
- @Element(data = true, name = "flvRecordingId")
- private Long id;
-
@Column(name = "name")
@Element(name = "fileName", data = true, required = false)
private String name;
@@ -104,16 +95,6 @@ public abstract class FileItem implement
@Enumerated(EnumType.STRING)
private Type type;
- @Override
- public Long getId() {
- return id;
- }
-
- @Override
- public void setId(Long id) {
- this.id = id;
- }
-
public String getName() {
return name;
}
@@ -233,7 +214,7 @@ public abstract class FileItem implement
}
public final boolean exists(String ext) {
- if (id != null && !isDeleted()) {
+ if (getId() != null && !isDeleted()) {
File f = getFile(ext);
return f != null && f.exists() && f.isFile();
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1755937&r1=1755936&r2=1755937&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
Thu Aug 11 11:10:38 2016
@@ -35,6 +35,9 @@ import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
@@ -110,6 +113,12 @@ public class Recording extends FileItem
, ERROR
}
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "id")
+ @Element(data = true, name = "flvRecordingId")
+ private Long id;
+
@Column(name = "alternate_download")
@Element(data = true, required = false)
private String alternateDownload;
@@ -168,6 +177,16 @@ public class Recording extends FileItem
@Transient
private List<RecordingLog> log;
+ @Override
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public String getComment() {
return comment;
}
