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

4
wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
public interface MindmapManager {
Collaborator getCollaboratorBy(@NotNull String email);
Collaborator findCollaborator(@NotNull String email);
Collaborator findCollaborator(long id);
@@ -62,4 +62,6 @@ public interface MindmapManager {
public List<MindMapHistory> getHistoryFrom(int mindmapId);
public MindMapHistory getHistory(int historyId);
void updateCollaboration(@NotNull Collaboration collaboration);
}

9
wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
View File

@@ -35,7 +35,7 @@ public class MindmapManagerImpl
implements MindmapManager {
@Override
public Collaborator getCollaboratorBy(final String email) {
public Collaborator findCollaborator(@NotNull final String email) {
final Collaborator collaborator;
final List<Collaborator> collaborators = getHibernateTemplate().find("from com.wisemapping.model.Collaborator collaborator where email=?", email);
if (collaborators != null && !collaborators.isEmpty()) {
@@ -69,6 +69,11 @@ public class MindmapManagerImpl
return getHibernateTemplate().get(MindMapHistory.class, historyId);
}
@Override
public void updateCollaboration(@NotNull Collaboration collaboration) {
getHibernateTemplate().save(collaboration);
}
@Override
public List<MindMap> search(MindMapCriteria criteria, int maxResult) {
final Criteria hibernateCriteria = getSession().createCriteria(MindMap.class);
@@ -138,7 +143,7 @@ public class MindmapManagerImpl
}
@Override
public void addCollaborator(Collaborator collaborator) {
public void addCollaborator(@NotNull Collaborator collaborator) {
assert collaborator != null : "ADD MINDMAP COLLABORATOR: Collaborator is required!";
getHibernateTemplate().save(collaborator);
}