vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 22:27:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check map before save.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2013-02-27 23:08:37 -03:00
parent 6155a70c04
commit b5a7a11920
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,13 +162,6 @@ public class MindmapController extends BaseController {
if (xml == null) { if (xml == null) {
throw new IllegalArgumentException("Map xml can not be null"); throw new IllegalArgumentException("Map xml can not be null");
} }
// Check that what we received a valid mindmap...
xml = xml.trim();
if (!xml.startsWith("<map") || !xml.endsWith("</map>")) {
throw new IllegalArgumentException("Map seems not to be a valid mindmap:"+xml);
}
mindmap.setXmlStr(xml); mindmap.setXmlStr(xml);
// Update map ... // Update map ...

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

@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -100,7 +101,19 @@ public class MindmapServiceImpl
@Override @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) { if (mindMap.getTitle() == null || mindMap.getTitle().length() == 0) {
throw new WiseMappingException("The tile can not be empty"); throw new WiseMappingException("The title can not be empty");
}
// Check that what we received a valid mindmap...
final String xml;
try {
xml = mindMap.getXmlStr().trim();
} catch (UnsupportedEncodingException e) {
throw new WiseMappingException("Could not be decoded.",e);
}
if (!xml.startsWith("<map") || !xml.endsWith("</map>")) {
throw new WiseMappingException("Map seems not to be a valid mindmap:"+xml);
} }
mindmapManager.updateMindmap(mindMap, saveHistory); mindmapManager.updateMindmap(mindMap, saveHistory);