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

Merge branch 'images'

Browse Source 
Conflicts:
	mindplot/src/main/javascript/StandaloneActionDispatcher.js
This commit is contained in:
Paulo Gustavo Veiga
2012-11-02 02:08:28 -03:00
parent d7c74e289e 155ec74dea
commit 45a190bbac
8 changed files with 369 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,7 +357,7 @@ public class FreemindImporter
* 3 -> 2
* 4 -> 4
*/
private int calcFirstLevelOrder(@NotNull List<Object> freeChilden, @NotNull Node freeChild) {
private int calcFirstLevelOrder(@NotNull List<Object> freeChilden, @Nullable Node freeChild) {
final List<Node> nodes = new ArrayList<Node>();
int result;