zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to HSQLDB driver

Browse Source 
Remove DWR
Remove native SVG tables
Add new REST services for persistence.
This commit is contained in:
Paulo Gustavo Veiga
2012-02-21 14:22:43 -03:00
parent 89f7fd8d3c
commit fb3f9946ae
58 changed files with 419 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wise-webapp/src/main/java/com/wisemapping/view/ColaboratorBean.java
View File

@@ -18,26 +18,26 @@
package com.wisemapping.view;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.UserRole;
import com.wisemapping.model.Colaborator;
import com.wisemapping.model.User;
public class ColaboratorBean
{
private UserRole userRole;
private boolean isUser;
private Colaborator colaborator;
private Collaborator collaborator;
public ColaboratorBean(Colaborator colaborator, UserRole role)
public ColaboratorBean(Collaborator collaborator, UserRole role)
{
this.colaborator = colaborator;
this.collaborator = collaborator;
this.userRole = role;
this.isUser = false;
}
public ColaboratorBean(User user, UserRole role)
{
this.colaborator = user;
this.collaborator = user;
this.userRole = role;
this.isUser = true;
}
@@ -54,16 +54,16 @@ public class ColaboratorBean
public String getUsername()
{
return isUser ? ((User)colaborator).getUsername() : colaborator.getEmail();
return isUser ? ((User) collaborator).getUsername() : collaborator.getEmail();
}
public String getEmail()
{
return colaborator.getEmail();
return collaborator.getEmail();
}
public long getId()
{
return colaborator.getId();
return collaborator.getId();
}
}

2
wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java
View File

@@ -104,7 +104,7 @@ public class MindMapBean {
if (source != null) {
for (MindmapUser mu : source) {
if (mu.getRole() == role) {
col.add(new ColaboratorBean(mu.getColaborator(), mu.getRole()));
col.add(new ColaboratorBean(mu.getCollaborator(), mu.getRole()));
}
}
}