From cce7f3e3bf8d09707ee162cb31edf8c39f8146b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Cl=C3=A9ment=20DAVID?= <clement.david@scilab.org>
Date: Fri, 29 Jul 2011 15:20:13 +0200
Subject: [PATCH] Xcos: exclude the type field introduced by d74e94

Change-Id: Ia1ba49c405f0e927258808902a45043071f9564f
---
 .../scilab/modules/graph/io/ScilabObjectCodec.java |    7 ++++++-
 .../org/scilab/modules/types/ScilabBoolean.java    |    5 ++++-
 .../org/scilab/modules/types/ScilabDouble.java     |   12 +++++++-----
 .../org/scilab/modules/types/ScilabInteger.java    |    5 ++++-
 .../java/org/scilab/modules/types/ScilabList.java  |    5 ++++-
 .../java/org/scilab/modules/types/ScilabMList.java |    5 ++++-
 .../org/scilab/modules/types/ScilabString.java     |    5 ++++-
 .../java/org/scilab/modules/types/ScilabTList.java |    5 ++++-
 .../java/org/scilab/modules/types/ScilabType.java  |    6 +++++-
 9 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java
index 1837165..ba9cd22 100644
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabObjectCodec.java
@@ -12,6 +12,8 @@
 
 package org.scilab.modules.graph.io;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Map;
 
 import org.scilab.modules.types.ScilabBoolean;
@@ -78,7 +80,10 @@ public abstract class ScilabObjectCodec extends mxObjectCodec {
 	public ScilabObjectCodec(Object template, String[] exclude,
 			String[] idrefs, Map<String, String> mapping) {
 		super(template, exclude, idrefs, mapping);
-
+		
+		final HashSet<String> newExclude = new HashSet<String>(this.exclude);
+		newExclude.add("type");
+		this.exclude = newExclude;
 	}
 
 	/**
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
index b79bec1..72e8877 100644
--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
@@ -16,7 +16,10 @@ package org.scilab.modules.types;
 import java.util.Arrays;
 
 /**
- * This class provides a representation on the Scilab boolean datatype<br />
+ * This class provides a representation on the Scilab boolean datatype<br>
+ * <br>
+ * This class is {@link java.io.Serializable} and any modification could 
+ * impact load and store of data (Xcos files, Javasci saved data, etc...).<br>
  * <br>
  * Example:<br />
  * <code>
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
index 85d2d8e..c80a4f6 100644
--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
@@ -16,22 +16,24 @@ package org.scilab.modules.types;
 import java.util.Arrays;
 
 /**
- * This class provides a representation on the Scilab Double datatype<br />
- * Note that double is the default datatype in Scilab
+ * This class provides a representation on the Scilab Double datatype<br>
+ * Note that double is the default datatype in Scilab.<br>
+ * <br>
+ * This class is {@link java.io.Serializable} and any modification could 
+ * impact load and store of data (Xcos files, Javasci saved data, etc...).<br>
  * <br>
  * Example (real):<br />
  * <code>
  * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
  * ScilabDouble aMatrix = new ScilabDouble(a);<br />
- * </code>
- * <br>
+ * </code> <br>
  * Example (complex):<br />
  * <code>
  * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
  * double [][]aImg={{210.2, 220.0, 420.0, 390.0},{230.2, 240.0, 440.0, 400.0}};<br />
-
  * ScilabDouble aMatrix = new ScilabDouble(a, aImg);
  * </code>
+ * 
  * @see org.scilab.modules.javasci.Scilab
  */
 public class ScilabDouble implements ScilabType {
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
index a284a2f..937bfa0 100644
--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
@@ -15,7 +15,10 @@ package org.scilab.modules.types;
 import java.util.Arrays;
 
 /**
- * This class provides a representation on the Scilab Integer datatype
+ * This class provides a representation on the Scilab Integer datatype<br>
+ * <br>
+ * This class is {@link java.io.Serializable} and any modification could 
+ * impact load and store of data (Xcos files, Javasci saved data, etc...).<br>
  * <br>
  * Example:<br />
  * <code>
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java
index 571de87..77e6715 100644
--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java
@@ -16,7 +16,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 /**
- * This class provides a representation on the Scilab List datatype
+ * This class provides a representation on the Scilab List datatype<br>
+ * <br>
+ * This class is {@link java.io.Serializable} and any modification could 
+ * impact load and store of data (Xcos files, Javasci saved data, etc...).<br>
  * <br>
  * Example:<br />
  * <code>
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
index 59ed9c6..b486a9a 100644
--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
@@ -16,7 +16,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 /**
- * This class provides a representation on the Scilab MList datatype
+ * This class provides a representation on the Scilab MList datatype<br>
+ * <br>
+ * This class is {@link java.io.Serializable} and any modification could 
+ * impact load and store of data (Xcos files, Javasci saved data, etc...).<br>
  * <br>
  * Example:<br />
  * <code>
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java
index 74b7702..dbe9de1 100644
--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java
@@ -15,7 +15,10 @@ package org.scilab.modules.types;
 import java.util.Arrays;
 
 /**
- * This class provides a representation on the Scilab String datatype
+ * This class provides a representation on the Scilab String datatype<br>
+ * <br>
+ * This class is {@link java.io.Serializable} and any modification could 
+ * impact load and store of data (Xcos files, Javasci saved data, etc...).<br>
  * <br>
  * Example:<br />
  * <code>
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
index 77de07b..1326c92 100644
--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
@@ -16,7 +16,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 /**
- * This class provides a representation on the Scilab TList datatype
+ * This class provides a representation on the Scilab TList datatype<br>
+ * <br>
+ * This class is {@link java.io.Serializable} and any modification could 
+ * impact load and store of data (Xcos files, Javasci saved data, etc...).<br>
  * <br>
  * Example:<br />
  * <code>
diff --git a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java
index ec16386..97a0c21 100644
--- a/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java
+++ b/scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java
@@ -15,7 +15,11 @@ package org.scilab.modules.types;
 import java.io.Serializable;
 
 /**
- * This interface specifies what is a Scilab types
+ * This interface specifies what is a Scilab types<br>
+ * <br>
+ * This class is {@link java.io.Serializable} and any modification could 
+ * impact load and store of data (Xcos files, Javasci saved data, etc...).<br>
+ * <br>
  */
 public interface ScilabType extends Serializable, Cloneable {
 
-- 
1.7.9.5