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

- Improve error handling on export

Browse Source 
- Validate FreeMind 0.9 or gretter during import
- Improve login message.
This commit is contained in:
Paulo Gustavo Veiga
2011-04-15 23:22:58 -03:00
parent 405f0d9998
commit 776e216e50
8 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wise-webapp/src/main/java/com/wisemapping/controller/ExportController.java
View File

@@ -41,6 +41,7 @@ import javax.xml.bind.JAXBException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;
import javax.xml.transform.TransformerException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -97,8 +98,13 @@ public class ExportController extends BaseMultiActionController {
}
}
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
// Change image link URL.
setBaseBaseImgUrl(format, properties);
ExporterFactory.export(properties, mindMap, bos, mapSvg);
// If the export goes ok, write the map to the stream ...
// Set format content type...
final String contentType = format.getContentType();
@@ -110,7 +116,7 @@ public class ExportController extends BaseMultiActionController {
// Write content ...
final ServletOutputStream outputStream = response.getOutputStream();
ExporterFactory.export(properties, mindMap, outputStream, mapSvg);
outputStream.write(bos.toByteArray());
} catch (Throwable e) {
@@ -125,7 +131,7 @@ public class ExportController extends BaseMultiActionController {
return null;
}
private void setBaseBaseImgUrl(ExportFormat format, @NotNull ExportProperties properties) {
private void setBaseBaseImgUrl(@NotNull ExportFormat format, @NotNull ExportProperties properties) {
final String baseUrl;
if (format == ExportFormat.SVG) {

2
wise-webapp/src/main/java/com/wisemapping/controller/RenameMindmapController.java
View File

@@ -40,7 +40,7 @@ public class RenameMindmapController
final MindMap mindMap = getMindmapFromRequest(httpServletRequest);
User user = Utils.getUser();
if (!mindMap.getOwner().equals(user)) {
throw new IllegalStateException("No enought right to execute this operation");
throw new IllegalStateException("No enough right to execute this operation");
}

2
wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java
View File

@@ -106,7 +106,7 @@ public class FreemindImporter
if (version != null) {
final VersionNumber mapVersion = new VersionNumber(version);
if (SUPPORTED_FREEMIND_VERSION.isGreaterThan(mapVersion)) {
throw new ImporterException("FreeMind map has been created with '" + mapVersion.getVersion() + "'. Supported FreeMind version is '" + SUPPORTED_FREEMIND_VERSION.getVersion() + "' or greater.");
throw new ImporterException("FreeMind version " + mapVersion.getVersion() + " is not supported.");
}
}

3
wise-webapp/src/main/java/com/wisemapping/validator/ImportMapValidator.java
View File

@@ -50,7 +50,8 @@ public class ImportMapValidator extends MapInfoValidator {
bean.setImportedMap(map);
} catch (ImporterException e) {
errors.rejectValue("mapFile",Messages.IMPORT_MAP_ERROR);
Object[] errorArgs = new Object[]{e.getMessage()};
errors.rejectValue("mapFile", Messages.IMPORT_MAP_ERROR,errorArgs,"FreeMind could not be imported.");
}
}
}