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

Migrate UserRegitration to MVC 3.0.

Browse Source 
wisemapping-servlet.xml is not used anymore.
This commit is contained in:
Paulo Gustavo Veiga
2012-06-16 19:27:22 -03:00
parent ea2bff60f7
commit 33131d4e9e
14 changed files with 116 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wise-webapp/src/main/java/com/wisemapping/view/ColaboratorBean.java → wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java
View File

@@ -22,20 +22,20 @@ import com.wisemapping.model.CollaborationRole;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.User;
public class ColaboratorBean
public class CollaboratorBean
{
private CollaborationRole collaborationRole;
private boolean isUser;
private Collaborator collaborator;
public ColaboratorBean(Collaborator collaborator, CollaborationRole role)
public CollaboratorBean(Collaborator collaborator, CollaborationRole role)
{
this.collaborator = collaborator;
this.collaborationRole = role;
this.isUser = false;
}
public ColaboratorBean(User user, CollaborationRole role)
public CollaboratorBean(User user, CollaborationRole role)
{
this.collaborator = user;
this.collaborationRole = role;

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

@@ -29,8 +29,8 @@ import java.util.*;
public class MindMapBean {
private MindMap mindMap;
private List<ColaboratorBean> viewers;
private List<ColaboratorBean> colaborators;
private List<CollaboratorBean> viewers;
private List<CollaboratorBean> colaborators;
public MindMapBean(final MindMap mindmap) {
this.mindMap = mindmap;
@@ -62,11 +62,11 @@ public class MindMapBean {
return mindMap.isStarred(Utils.getUser());
}
public List<ColaboratorBean> getViewers() {
public List<CollaboratorBean> getViewers() {
return viewers;
}
public List<ColaboratorBean> getCollaborators() {
public List<CollaboratorBean> getCollaborators() {
return colaborators;
}
@@ -86,12 +86,12 @@ public class MindMapBean {
return mindMap.getTags();
}
private List<ColaboratorBean> getColaboratorBy(Set<Collaboration> source, CollaborationRole role) {
List<ColaboratorBean> col = new ArrayList<ColaboratorBean>();
private List<CollaboratorBean> getColaboratorBy(Set<Collaboration> source, CollaborationRole role) {
List<CollaboratorBean> col = new ArrayList<CollaboratorBean>();
if (source != null) {
for (Collaboration mu : source) {
if (mu.getRole() == role) {
col.add(new ColaboratorBean(mu.getCollaborator(), mu.getRole()));
col.add(new CollaboratorBean(mu.getCollaborator(), mu.getRole()));
}
}
}