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

Solve expcetion on editor exception on starred for a viewer.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-06-17 23:21:02 -03:00
parent 29091dec88
commit f25ea3a377
10 changed files with 63 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java
View File

@@ -28,38 +28,40 @@ import java.io.IOException;
public interface MindmapService {
public static final String TAG_SEPARATOR = " ";
static final String TAG_SEPARATOR = " ";
public MindMap findMindmapById(int mindmapId);
MindMap findMindmapById(int mindmapId);
public MindMap getMindmapByTitle(String title, User user);
MindMap getMindmapByTitle(String title, User user);
public List<Collaboration> findCollaborations(@NotNull User user);
List<Collaboration> findCollaborations(@NotNull User user);
public void updateMindmap(MindMap mindMap, boolean saveHistory) throws WiseMappingException;
void updateMindmap(MindMap mindMap, boolean saveHistory) throws WiseMappingException;
public void addMindmap(MindMap map, User user) throws WiseMappingException;
void addMindmap(MindMap map, User user) throws WiseMappingException;
public void addCollaboration(@NotNull MindMap mindmap, @NotNull String email, @NotNull CollaborationRole role, @Nullable String message)
void addCollaboration(@NotNull MindMap mindmap, @NotNull String email, @NotNull CollaborationRole role, @Nullable String message)
throws CollaborationException;
public void removeCollaboration(@NotNull MindMap mindmap, @NotNull Collaboration collaboration) throws CollaborationException;
void removeCollaboration(@NotNull MindMap mindmap, @NotNull Collaboration collaboration) throws CollaborationException;
public void addTags(@NotNull MindMap mindmap, String tags);
void addTags(@NotNull MindMap mindmap, String tags);
public void removeMindmap(@NotNull final MindMap mindmap, @NotNull final User user) throws WiseMappingException;
void removeMindmap(@NotNull final MindMap mindmap, @NotNull final User user) throws WiseMappingException;
public List<MindMap> search(MindMapCriteria criteria);
List<MindMap> search(MindMapCriteria criteria);
public List<MindMapHistory> findMindmapHistory(int mindmapId);
List<MindMapHistory> findMindmapHistory(int mindmapId);
public boolean hasPermissions(@Nullable User user, MindMap map, CollaborationRole allowedRole);
boolean hasPermissions(@Nullable User user, MindMap map, CollaborationRole allowedRole);
public boolean hasPermissions(@Nullable User user, int mapId, CollaborationRole allowedRole);
boolean hasPermissions(@Nullable User user, int mapId, CollaborationRole allowedRole);
public void addWelcomeMindmap(User user) throws WiseMappingException;
void addWelcomeMindmap(User user) throws WiseMappingException;
public void revertChange(@NotNull MindMap map, int historyId) throws WiseMappingException;
void revertChange(@NotNull MindMap map, int historyId) throws WiseMappingException;
MindMapHistory findMindmapHistory(int id, int hid) throws WiseMappingException;
void updateCollaboration(@NotNull Collaborator collaborator, @NotNull Collaboration collaboration) throws WiseMappingException;
}

13
wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
View File

@@ -187,7 +187,7 @@ public class MindmapServiceImpl
private Collaborator addCollaborator(String email) {
// Add a new collaborator ...
Collaborator collaborator = mindmapManager.getCollaboratorBy(email);
Collaborator collaborator = mindmapManager.findCollaborator(email);
if (collaborator == null) {
collaborator = new Collaborator();
collaborator.setEmail(email);
@@ -219,6 +219,7 @@ public class MindmapServiceImpl
}
}
@Override
public void addWelcomeMindmap(User user) throws WiseMappingException {
final MindMap savedWelcome = findMindmapById(Constants.WELCOME_MAP_ID);
@@ -233,10 +234,12 @@ public class MindmapServiceImpl
}
}
@Override
public List<MindMapHistory> findMindmapHistory(int mindmapId) {
return mindmapManager.getHistoryFrom(mindmapId);
}
@Override
public void revertChange(@NotNull MindMap mindmap, int historyId)
throws WiseMappingException {
final MindMapHistory history = mindmapManager.getHistory(historyId);
@@ -261,6 +264,14 @@ public class MindmapServiceImpl
return result;
}
@Override
public void updateCollaboration(@NotNull Collaborator collaborator, @NotNull Collaboration collaboration) throws WiseMappingException {
if (collaborator.equals(collaboration.getCollaborator())) {
throw new WiseMappingException("No enough permissions for this operation.");
}
mindmapManager.updateCollaboration(collaboration);
}
private Collaboration getCollaborationBy(String email, Set<Collaboration> collaborations) {
Collaboration collaboration = null;