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

4
wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
View File

@@ -19,7 +19,7 @@
package com.wisemapping.rest;
import com.wisemapping.mail.NotificationService;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
import com.wisemapping.rest.model.RestLogItem;
import com.wisemapping.security.Utils;
@@ -96,7 +96,7 @@ public class AccountController extends BaseController {
@RequestMapping(method = RequestMethod.POST, value = "logger/editor", consumes = {"application/xml", "application/json"}, produces = {"application/json", "text/html", "application/xml"})
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void changePassword(@RequestBody RestLogItem item) {
final MindMap mindmap = mindmapService.findMindmapById(item.getMapId());
final Mindmap mindmap = mindmapService.findMindmapById(item.getMapId());
final User user = Utils.getUser();
notificationService.reportMindmapEditorError(mindmap, user, item.getUserAgent(), item.getJsErrorMsg() + "\n" + item.getJsStack());
}

48
wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
View File

@@ -57,7 +57,7 @@ public class MindmapController extends BaseController {
@ResponseBody
public ModelAndView retrieve(@PathVariable int id) throws WiseMappingException {
final User user = Utils.getUser();
final MindMap mindMap = mindmapService.findMindmapById(id);
final Mindmap mindMap = mindmapService.findMindmapById(id);
final RestMindmap map = new RestMindmap(mindMap, user);
return new ModelAndView("mapView", "map", map);
@@ -66,7 +66,7 @@ public class MindmapController extends BaseController {
@RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/wisemapping+xml"}, params = {"download=wxml"})
@ResponseBody
public ModelAndView retrieveAsWise(@PathVariable int id) throws WiseMappingException {
final MindMap mindMap = mindmapService.findMindmapById(id);
final Mindmap mindMap = mindmapService.findMindmapById(id);
final Map<String, Object> values = new HashMap<String, Object>();
final User user = Utils.getUser();
@@ -78,7 +78,7 @@ public class MindmapController extends BaseController {
@RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm"})
@ResponseBody
public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id) throws IOException {
final MindMap mindMap = mindmapService.findMindmapById(id);
final Mindmap mindMap = mindmapService.findMindmapById(id);
final Map<String, Object> values = new HashMap<String, Object>();
values.put("content", mindMap.getXmlStr());
values.put("filename", mindMap.getTitle());
@@ -92,9 +92,9 @@ public class MindmapController extends BaseController {
final MindmapFilter filter = MindmapFilter.parse(q);
final List<Collaboration> collaborations = mindmapService.findCollaborations(user);
final List<MindMap> mindmaps = new ArrayList<MindMap>();
final List<Mindmap> mindmaps = new ArrayList<Mindmap>();
for (Collaboration collaboration : collaborations) {
final MindMap mindmap = collaboration.getMindMap();
final Mindmap mindmap = collaboration.getMindMap();
if (filter.accept(mindmap, user)) {
mindmaps.add(mindmap);
}
@@ -118,7 +118,7 @@ public class MindmapController extends BaseController {
@RequestMapping(value = "maps/{id}/history/{hid}", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateRevertMindmap(@PathVariable int id, @PathVariable String hid) throws WiseMappingException {
final MindMap mindmap = mindmapService.findMindmapById(id);
final Mindmap mindmap = mindmapService.findMindmapById(id);
final User user = Utils.getUser();
if (LATEST_HISTORY_REVISION.equals(hid)) {
@@ -138,7 +138,7 @@ public class MindmapController extends BaseController {
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateDocument(@RequestBody RestMindmap restMindmap, @PathVariable int id, @RequestParam(required = false) boolean minor) throws WiseMappingException, IOException {
final MindMap mindmap = mindmapService.findMindmapById(id);
final Mindmap mindmap = mindmapService.findMindmapById(id);
final User user = Utils.getUser();
// Validate arguments ...
@@ -169,7 +169,7 @@ public class MindmapController extends BaseController {
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void update(@RequestBody RestMindmap restMindmap, @PathVariable int id, @RequestParam(required = false) boolean minor) throws IOException, WiseMappingException {
final MindMap mindmap = mindmapService.findMindmapById(id);
final Mindmap mindmap = mindmapService.findMindmapById(id);
final User user = Utils.getUser();
final String xml = restMindmap.getXml();
@@ -213,7 +213,7 @@ public class MindmapController extends BaseController {
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateTitle(@RequestBody String title, @PathVariable int id) throws WiseMappingException {
final MindMap mindMap = mindmapService.findMindmapById(id);
final Mindmap mindMap = mindmapService.findMindmapById(id);
final User user = Utils.getUser();
// Is there a map with the same name ?
@@ -223,7 +223,7 @@ public class MindmapController extends BaseController {
}
// Update map ...
final MindMap mindmap = mindmapService.findMindmapById(id);
final Mindmap mindmap = mindmapService.findMindmapById(id);
mindmap.setTitle(title);
saveMindmap(true, mindMap, user);
}
@@ -231,7 +231,7 @@ public class MindmapController extends BaseController {
@RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/collabs", consumes = {"application/json", "application/xml"}, produces = {"application/json", "text/html", "application/xml"})
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateCollabs(@PathVariable int id, @NotNull @RequestBody RestCollaborationList restCollabs) throws CollaborationException {
final MindMap mindMap = mindmapService.findMindmapById(id);
final Mindmap mindMap = mindmapService.findMindmapById(id);
// Only owner can change collaborators...
final User user = Utils.getUser();
@@ -271,7 +271,7 @@ public class MindmapController extends BaseController {
@RequestMapping(method = RequestMethod.GET, value = "/maps/{id}/collabs", produces = {"application/json", "text/html", "application/xml"})
public ModelAndView retrieveList(@PathVariable int id) {
final MindMap mindMap = mindmapService.findMindmapById(id);
final Mindmap mindMap = mindmapService.findMindmapById(id);
final Set<Collaboration> collaborations = mindMap.getCollaborations();
final List<RestCollaboration> collabs = new ArrayList<RestCollaboration>();
@@ -290,11 +290,11 @@ public class MindmapController extends BaseController {
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateDescription(@RequestBody String description, @PathVariable int id) throws WiseMappingException {
final MindMap mindMap = mindmapService.findMindmapById(id);
final Mindmap mindMap = mindmapService.findMindmapById(id);
final User user = Utils.getUser();
// Update map ...
final MindMap mindmap = mindmapService.findMindmapById(id);
final Mindmap mindmap = mindmapService.findMindmapById(id);
mindmap.setDescription(description);
saveMindmap(true, mindMap, user);
}
@@ -303,7 +303,7 @@ public class MindmapController extends BaseController {
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updatePublishState(@RequestBody String value, @PathVariable int id) throws WiseMappingException {
final MindMap mindMap = mindmapService.findMindmapById(id);
final Mindmap mindMap = mindmapService.findMindmapById(id);
final User user = Utils.getUser();
if (!mindMap.hasPermissions(user, CollaborationRole.OWNER)) {
@@ -320,7 +320,7 @@ public class MindmapController extends BaseController {
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateStarredState(@RequestBody String value, @PathVariable int id) throws WiseMappingException {
final MindMap mindmap = mindmapService.findMindmapById(id);
final Mindmap mindmap = mindmapService.findMindmapById(id);
final User user = Utils.getUser();
// Update map status ...
@@ -337,7 +337,7 @@ public class MindmapController extends BaseController {
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateMap(@PathVariable int id) throws IOException, WiseMappingException {
final User user = Utils.getUser();
final MindMap mindmap = mindmapService.findMindmapById(id);
final Mindmap mindmap = mindmapService.findMindmapById(id);
mindmapService.removeMindmap(mindmap, user);
}
@@ -347,7 +347,7 @@ public class MindmapController extends BaseController {
final User user = Utils.getUser();
final String[] mapsIds = ids.split(",");
for (final String mapId : mapsIds) {
final MindMap mindmap = mindmapService.findMindmapById(Integer.parseInt(mapId));
final Mindmap mindmap = mindmapService.findMindmapById(Integer.parseInt(mapId));
mindmapService.removeMindmap(mindmap, user);
}
}
@@ -372,10 +372,10 @@ public class MindmapController extends BaseController {
}
// If the user has not specified the xml content, add one ...
final MindMap delegated = restMindmap.getDelegated();
final Mindmap delegated = restMindmap.getDelegated();
String xml = restMindmap.getXml();
if (xml == null || xml.isEmpty()) {
xml = MindMap.getDefaultMindmapXml(restMindmap.getTitle());
xml = Mindmap.getDefaultMindmapXml(restMindmap.getTitle());
}
delegated.setXmlStr(xml);
@@ -393,7 +393,7 @@ public class MindmapController extends BaseController {
public void createMapFromFreemind(@RequestBody byte[] freemindXml, @RequestParam(required = true) String title, @RequestParam(required = false) String description, @NotNull HttpServletResponse response) throws IOException, WiseMappingException {
// Convert map ...
final MindMap mindMap;
final Mindmap mindMap;
try {
final Importer importer = ImporterFactory.getInstance().getImporter(ImportFormat.FREEMIND);
final ByteArrayInputStream stream = new ByteArrayInputStream(freemindXml);
@@ -421,8 +421,8 @@ public class MindmapController extends BaseController {
final User user = Utils.getUser();
// Create a shallowCopy of the map ...
final MindMap mindMap = mindmapService.findMindmapById(id);
final MindMap clonedMap = mindMap.shallowClone();
final Mindmap mindMap = mindmapService.findMindmapById(id);
final Mindmap clonedMap = mindMap.shallowClone();
clonedMap.setTitle(restMindmap.getTitle());
clonedMap.setDescription(restMindmap.getDescription());
@@ -434,7 +434,7 @@ public class MindmapController extends BaseController {
response.setHeader("ResourceId", Integer.toString(clonedMap.getId()));
}
private void saveMindmap(boolean minor, @NotNull final MindMap mindMap, @NotNull final User user) throws WiseMappingException {
private void saveMindmap(boolean minor, @NotNull final Mindmap mindMap, @NotNull final User user) throws WiseMappingException {
final Calendar now = Calendar.getInstance();
mindMap.setLastModificationTime(now);
mindMap.setLastEditor(user);

14
wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
View File

@@ -20,7 +20,7 @@
package com.wisemapping.rest;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -28,32 +28,32 @@ import org.jetbrains.annotations.Nullable;
public enum MindmapFilter {
ALL("all") {
@Override
public boolean accept(@NotNull MindMap mindmap, @NotNull User user) {
public boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
return true;
}
},
MY_MAPS("my_maps") {
@Override
boolean accept(@NotNull MindMap mindmap, @NotNull User user) {
boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
return mindmap.getCreator().equals(user);
}
},
STARRED("starred") {
@Override
boolean accept(@NotNull MindMap mindmap, @NotNull User user) {
boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
return mindmap.isStarred(user);
}
},
SHARED_WITH_ME("shared_with_me") {
@Override
boolean accept(@NotNull MindMap mindmap, @NotNull User user) {
boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
return !MY_MAPS.accept(mindmap, user);
}
},
PUBLIC("public") {
@Override
boolean accept(@NotNull MindMap mindmap, @NotNull User user) {
boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
return mindmap.isPublic();
}
};
@@ -76,6 +76,6 @@ public enum MindmapFilter {
return result;
}
abstract boolean accept(@NotNull MindMap mindmap, @NotNull User user);
abstract boolean accept(@NotNull Mindmap mindmap, @NotNull User user);
}

2
wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java
View File

@@ -1,8 +1,6 @@
package com.wisemapping.rest.model;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.MindMap;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.jetbrains.annotations.NotNull;

8
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java
View File

@@ -27,7 +27,7 @@ public class RestMindmap {
@JsonIgnore
private Collaborator collaborator;
@JsonIgnore
private MindMap mindmap;
private Mindmap mindmap;
@JsonIgnore
static private SimpleDateFormat sdf;
private String properties;
@@ -38,11 +38,11 @@ public class RestMindmap {
}
public RestMindmap() throws WiseMappingException {
this(new MindMap(), null);
this(new Mindmap(), null);
}
public RestMindmap(@NotNull MindMap mindmap, @Nullable Collaborator collaborator) throws WiseMappingException {
public RestMindmap(@NotNull Mindmap mindmap, @Nullable Collaborator collaborator) throws WiseMappingException {
this.mindmap = mindmap;
this.collaborator = collaborator;
if (collaborator != null) {
@@ -172,7 +172,7 @@ public class RestMindmap {
}
@JsonIgnore
public MindMap getDelegated() {
public Mindmap getDelegated() {
return this.mindmap;
}

6
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java
View File

@@ -1,16 +1,10 @@
package com.wisemapping.rest.model;
import com.wisemapping.model.Collaboration;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.MindMapHistory;
import com.wisemapping.security.Utils;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

10
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
View File

@@ -3,7 +3,7 @@ package com.wisemapping.rest.model;
import com.wisemapping.model.Collaboration;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
import com.wisemapping.security.Utils;
import org.codehaus.jackson.annotate.*;
@@ -30,7 +30,7 @@ import java.util.TimeZone;
public class RestMindmapInfo {
@JsonIgnore
private MindMap mindmap;
private Mindmap mindmap;
private Collaborator collaborator;
@JsonIgnore
static private SimpleDateFormat sdf;
@@ -41,11 +41,11 @@ public class RestMindmapInfo {
}
public RestMindmapInfo() {
this(new MindMap(), null);
this(new Mindmap(), null);
}
public RestMindmapInfo(@NotNull MindMap mindmap, @Nullable Collaborator collaborator) {
public RestMindmapInfo(@NotNull Mindmap mindmap, @Nullable Collaborator collaborator) {
this.mindmap = mindmap;
this.collaborator = collaborator;
}
@@ -135,7 +135,7 @@ public class RestMindmapInfo {
}
@JsonIgnore
public MindMap getDelegated() {
public Mindmap getDelegated() {
return this.mindmap;
}

8
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java
View File

@@ -2,7 +2,7 @@ package com.wisemapping.rest.model;
import com.wisemapping.model.Collaborator;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.Mindmap;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.jetbrains.annotations.NotNull;
@@ -26,12 +26,12 @@ public class RestMindmapList {
private List<RestMindmapInfo> mindmapsInfo;
public RestMindmapList() {
this(Collections.<MindMap>emptyList(), null);
this(Collections.<Mindmap>emptyList(), null);
}
public RestMindmapList(@NotNull List<MindMap> mindmaps, @NotNull Collaborator collaborator) {
public RestMindmapList(@NotNull List<Mindmap> mindmaps, @NotNull Collaborator collaborator) {
this.mindmapsInfo = new ArrayList<RestMindmapInfo>();
for (MindMap mindMap : mindmaps) {
for (Mindmap mindMap : mindmaps) {
this.mindmapsInfo.add(new RestMindmapInfo(mindMap, collaborator));
}
}

4
wise-webapp/src/main/java/com/wisemapping/rest/view/ImportTransformationView.java
View File

@@ -22,7 +22,7 @@ import com.wisemapping.importer.ImportFormat;
import com.wisemapping.importer.Importer;
import com.wisemapping.importer.ImporterException;
import com.wisemapping.importer.ImporterFactory;
import com.wisemapping.model.MindMap;
import com.wisemapping.model.Mindmap;
import org.jetbrains.annotations.NotNull;
import org.springframework.web.servlet.view.AbstractView;
@@ -51,7 +51,7 @@ public class ImportTransformationView extends AbstractView {
// Convert to map ...
final InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
final MindMap mindMap = importer.importMap("filename", "filename", is);
final Mindmap mindMap = importer.importMap("filename", "filename", is);
// Set file name...
final String fileName = (filename != null ? filename : "map") + "." + "xwise";