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

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));
}
}