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

- IE window.open does not support base href tag. Fixed.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-08-15 21:28:51 -03:00
parent dde7806b38
commit 5f441c2c20
38 changed files with 1310 additions and 1327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,40 +24,39 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.io.IOException;
public interface MindmapService {
static final String TAG_SEPARATOR = " ";
MindMap findMindmapById(int mindmapId);
Mindmap findMindmapById(int mindmapId);
MindMap getMindmapByTitle(String title, User user);
Mindmap getMindmapByTitle(String title, User user);
List<Collaboration> findCollaborations(@NotNull User user);
void updateMindmap(MindMap mindMap, boolean saveHistory) throws WiseMappingException;
void updateMindmap(Mindmap mindMap, boolean saveHistory) throws WiseMappingException;
void addMindmap(MindMap map, User user) throws WiseMappingException;
void addMindmap(Mindmap map, User user) throws WiseMappingException;
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;
void removeCollaboration(@NotNull MindMap mindmap, @NotNull Collaboration collaboration) throws CollaborationException;
void removeCollaboration(@NotNull Mindmap mindmap, @NotNull Collaboration collaboration) throws CollaborationException;
void addTags(@NotNull MindMap mindmap, String tags);
void addTags(@NotNull Mindmap mindmap, String tags);
void removeMindmap(@NotNull final MindMap mindmap, @NotNull final User user) throws WiseMappingException;
void removeMindmap(@NotNull final Mindmap mindmap, @NotNull final User user) throws WiseMappingException;
List<MindMap> search(MindMapCriteria criteria);
List<Mindmap> search(MindMapCriteria criteria);
List<MindMapHistory> findMindmapHistory(int mindmapId);
boolean hasPermissions(@Nullable User user, MindMap map, CollaborationRole allowedRole);
boolean hasPermissions(@Nullable User user, Mindmap map, CollaborationRole allowedRole);
boolean hasPermissions(@Nullable User user, int mapId, CollaborationRole allowedRole);
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;

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

@@ -46,12 +46,12 @@ public class MindmapServiceImpl
@Override
public boolean hasPermissions(@Nullable User user, int mapId, @NotNull CollaborationRole grantedRole) {
final MindMap map = mindmapManager.getMindmapById(mapId);
final Mindmap map = mindmapManager.getMindmapById(mapId);
return hasPermissions(user, map, grantedRole);
}
@Override
public boolean hasPermissions(@Nullable User user, @Nullable MindMap map, @NotNull CollaborationRole role) {
public boolean hasPermissions(@Nullable User user, @Nullable Mindmap map, @NotNull CollaborationRole role) {
boolean result = false;
if (map != null) {
if (map.isPublic() && role == CollaborationRole.VIEWER) {
@@ -68,12 +68,12 @@ public class MindmapServiceImpl
}
@Override
public MindMap getMindmapByTitle(String title, User user) {
public Mindmap getMindmapByTitle(String title, User user) {
return mindmapManager.getMindmapByTitle(title, user);
}
@Override
public MindMap findMindmapById(int mindmapId) {
public Mindmap findMindmapById(int mindmapId) {
return mindmapManager.getMindmapById(mindmapId);
}
@@ -83,7 +83,7 @@ public class MindmapServiceImpl
}
@Override
public void updateMindmap(@NotNull MindMap mindMap, boolean saveHistory) throws WiseMappingException {
public void updateMindmap(@NotNull Mindmap mindMap, boolean saveHistory) throws WiseMappingException {
if (mindMap.getTitle() == null || mindMap.getTitle().length() == 0) {
throw new WiseMappingException("The tile can not be empty");
}
@@ -91,14 +91,14 @@ public class MindmapServiceImpl
}
@Override
public List<MindMap> search(MindMapCriteria criteria) {
public List<Mindmap> search(MindMapCriteria criteria) {
return mindmapManager.search(criteria);
}
@Override
public void removeCollaboration(@NotNull MindMap mindmap, @NotNull Collaboration collaboration) throws CollaborationException {
public void removeCollaboration(@NotNull Mindmap mindmap, @NotNull Collaboration collaboration) throws CollaborationException {
// remove collaborator association
final MindMap mindMap = collaboration.getMindMap();
final Mindmap mindMap = collaboration.getMindMap();
final Set<Collaboration> collaborations = mindMap.getCollaborations();
if (mindMap.getCreator().getEmail().equals(collaboration.getCollaborator().getEmail())) {
@@ -111,7 +111,7 @@ public class MindmapServiceImpl
}
@Override
public void removeMindmap(@NotNull MindMap mindmap, @NotNull User user) throws WiseMappingException {
public void removeMindmap(@NotNull Mindmap mindmap, @NotNull User user) throws WiseMappingException {
if (mindmap.getCreator().equals(user)) {
mindmapManager.removeMindmap(mindmap);
} else {
@@ -123,7 +123,7 @@ public class MindmapServiceImpl
}
@Override
public void addMindmap(@NotNull MindMap map, @NotNull User user) throws WiseMappingException {
public void addMindmap(@NotNull Mindmap map, @NotNull User user) throws WiseMappingException {
final String title = map.getTitle();
@@ -151,7 +151,7 @@ public class MindmapServiceImpl
}
@Override
public void addCollaboration(@NotNull MindMap mindmap, @NotNull String email, @NotNull CollaborationRole role, @Nullable String message)
public void addCollaboration(@NotNull Mindmap mindmap, @NotNull String email, @NotNull CollaborationRole role, @Nullable String message)
throws CollaborationException {
// Validate
@@ -197,7 +197,7 @@ public class MindmapServiceImpl
}
@Override
public void addTags(@NotNull MindMap mindmap, String tags) {
public void addTags(@NotNull Mindmap mindmap, String tags) {
mindmap.setTags(tags);
mindmapManager.updateMindmap(mindmap, false);
if (tags != null && tags.length() > 0) {
@@ -226,7 +226,7 @@ public class MindmapServiceImpl
}
@Override
public void revertChange(@NotNull MindMap mindmap, int historyId)
public void revertChange(@NotNull Mindmap mindmap, int historyId)
throws WiseMappingException {
final MindMapHistory history = mindmapManager.getHistory(historyId);
mindmap.setXml(history.getXml());

11
wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
View File

@@ -23,9 +23,8 @@ import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.mail.NotificationService;
import com.wisemapping.model.AccessAuditory;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
import org.apache.commons.io.IOUtils;
import org.apache.velocity.app.VelocityEngine;
import org.jetbrains.annotations.NotNull;
import org.springframework.context.MessageSource;
@@ -33,8 +32,6 @@ import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ui.velocity.VelocityEngineUtils;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.*;
public class UserServiceImpl
@@ -130,7 +127,7 @@ public class UserServiceImpl
}
//create welcome map
final MindMap mindMap = buildWelcomeMindmap(user.getFirstname());
final Mindmap mindMap = buildWelcomeMindmap(user.getFirstname());
mindmapService.addMindmap(mindMap, user);
@@ -145,13 +142,13 @@ public class UserServiceImpl
return user;
}
public MindMap buildWelcomeMindmap(@NotNull String firstName) {
public Mindmap buildWelcomeMindmap(@NotNull String firstName) {
//To change body of created methods use File | Settings | File Templates.
Locale locale = LocaleContextHolder.getLocale();
// @TODO: Remove this once is translated
locale = Locale.ENGLISH;
MindMap result = new MindMap();
Mindmap result = new Mindmap();
final Map<String, Object> model = new HashMap<String, Object>();
model.put("messages", messageSource);
model.put("noArgs", new Object[]{});