File scilab-self-closing-br.patch of Package scilab
Index: scilab-5.5.2/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
===================================================================
--- scilab-5.5.2.orig/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
+++ scilab-5.5.2/modules/helptools/src/java/org/scilab/modules/helptools/HTMLDocbookTagConverter.java
@@ -1973,7 +1973,7 @@ public class HTMLDocbookTagConverter ext
buffer.append(">");
break;
case '\n':
- buffer.append("<br />");
+ buffer.append("<br>");
break;
case '\'':
buffer.append("'");
Index: scilab-5.5.2/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
===================================================================
--- scilab-5.5.2.orig/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
+++ scilab-5.5.2/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
@@ -38,17 +38,17 @@ import org.scilab.modules.javasci.Javasc
/**
* This class provides the capability to access to the Scilab engine from
- * a Java application.<br />
- * <br />
- * Example:<br />
+ * a Java application.<br>
+ * <br>
+ * Example:<br>
* <code>
- * Scilab sci = new Scilab();<br />
- * if (sci.open()) {<br />
- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
- * ScilabDouble aOriginal = new ScilabDouble(a);<br />
- * sci.put("a",aOriginal);<br />
- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
- * }<br />
+ * Scilab sci = new Scilab();<br>
+ * if (sci.open()) {<br>
+ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br>
+ * ScilabDouble aOriginal = new ScilabDouble(a);<br>
+ * sci.put("a",aOriginal);<br>
+ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br>
+ * }<br>
* </code>
* @see org.scilab.modules.types
*/
@@ -60,7 +60,7 @@ public class Scilab {
private boolean advancedMode = false;
/**
- * Creator of the Scilab Javasci object. <br />
+ * Creator of the Scilab Javasci object. <br>
* Scilab data path is autodetected and advanced features disabled
*/
public Scilab() throws InitializationException {
@@ -68,13 +68,13 @@ public class Scilab {
}
/**
- * Creator of the Scilab Javasci object with a specific Scilab path.<br />
+ * Creator of the Scilab Javasci object with a specific Scilab path.<br>
* Advanced features are disabled (faster)
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * Scilab sci = new Scilab("/path/to/Scilab/data/dir/");<br />
- * <br />
+ * Scilab sci = new Scilab("/path/to/Scilab/data/dir/");<br>
+ * <br>
* </code>
* @param SCI provide the path to Scilab data
*/
@@ -83,13 +83,13 @@ public class Scilab {
}
/**
- * Creator of the Scilab Javasci object in advanced mode<br />
+ * Creator of the Scilab Javasci object in advanced mode<br>
* Scilab data path is autodetected
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * Scilab sci = new Scilab(true); // Starts in advanced mode<br />
- * <br />
+ * Scilab sci = new Scilab(true); // Starts in advanced mode<br>
+ * <br>
* </code>
* @param advancedMode true enables the advanced mode (GUI, graphics, Tcl/Tk, sciNotes...). Smaller.
*/
@@ -98,17 +98,17 @@ public class Scilab {
}
/**
- * Creator of the Scilab Javasci object. <br />
- * Under GNU/Linux / Mac OS X, try to detect Scilab base path<br />
- * if the property SCI is set, use it<br />
- * if not, try with the global variable SCI<br />
- * if not, throws a new exception<br />
- * Under Windows, use also the registery<br />
- * <br />
- * Example:<br />
+ * Creator of the Scilab Javasci object. <br>
+ * Under GNU/Linux / Mac OS X, try to detect Scilab base path<br>
+ * if the property SCI is set, use it<br>
+ * if not, try with the global variable SCI<br>
+ * if not, throws a new exception<br>
+ * Under Windows, use also the registery<br>
+ * <br>
+ * Example:<br>
* <code>
- * Scilab sci = new Scilab("/path/to/Scilab/data/dir/",true); // Starts in advanced mode<br />
- * <br />
+ * Scilab sci = new Scilab("/path/to/Scilab/data/dir/",true); // Starts in advanced mode<br>
+ * <br>
* </code>
* @param SCIPath the path to Scilab data
* @param advancedMode true enables the advanced mode (GUI, graphics, Tcl/Tk, sciNotes...). Smaller.
@@ -150,16 +150,16 @@ public class Scilab {
}
/**
- * Open a connection to the Scilab engine<br />
- * This function is based on Call_ScilabOpen from call_scilab<br />
- * Note: For now, only one instance of Scilab can be launched<br />
- * A second launch will return FALSE<br />
- * <br />
- * Example:<br />
- * <code>
- * Scilab sci = new Scilab();<br />
- * sci.open();<br />
- * <br />
+ * Open a connection to the Scilab engine<br>
+ * This function is based on Call_ScilabOpen from call_scilab<br>
+ * Note: For now, only one instance of Scilab can be launched<br>
+ * A second launch will return FALSE<br>
+ * <br>
+ * Example:<br>
+ * <code>
+ * Scilab sci = new Scilab();<br>
+ * sci.open();<br>
+ * <br>
* </code>
* @return if the operation is successful
* @throws AlreadyRunningException Scilab is already running
@@ -185,16 +185,16 @@ public class Scilab {
}
/**
- * Open a connection to the Scilab engine and run the command job<br />
- * This function is based on Call_ScilabOpen from call_scilab<br />
- * Note: For now, only one instance of Scilab can be launched<br />
- * A second launch will return FALSE<br />
- * <br />
- * Example:<br />
- * <code>
- * Scilab sci = new Scilab();<br />
- * sci.open("a=%pi;");<br />
- * <br />
+ * Open a connection to the Scilab engine and run the command job<br>
+ * This function is based on Call_ScilabOpen from call_scilab<br>
+ * Note: For now, only one instance of Scilab can be launched<br>
+ * A second launch will return FALSE<br>
+ * <br>
+ * Example:<br>
+ * <code>
+ * Scilab sci = new Scilab();<br>
+ * sci.open("a=%pi;");<br>
+ * <br>
* </code>
* @param job The job to run on startup
* @return if the operation is successful
@@ -208,16 +208,16 @@ public class Scilab {
}
/**
- * Open a connection to the Scilab engine and run commands job<br />
- * This function is based on Call_ScilabOpen from call_scilab<br />
- * Note: For now, only one instance of Scilab can be launched<br />
- * A second launch will return FALSE<br />
- * <br />
- * Example:<br />
- * <code>
- * Scilab sci = new Scilab();<br />
- * sci.open(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<br />
- * <br />
+ * Open a connection to the Scilab engine and run commands job<br>
+ * This function is based on Call_ScilabOpen from call_scilab<br>
+ * Note: For now, only one instance of Scilab can be launched<br>
+ * A second launch will return FALSE<br>
+ * <br>
+ * Example:<br>
+ * <code>
+ * Scilab sci = new Scilab();<br>
+ * sci.open(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<br>
+ * <br>
* </code>
* @param jobs The serie of jobs to run on startup
* @return if the operation is successful
@@ -231,16 +231,16 @@ public class Scilab {
/**
- * Open a connection to the Scilab engine and run thefile scriptFilename<br />
- * This function is based on Call_ScilabOpen from call_scilab<br />
- * Note: For now, only one instance of Scilab can be launched<br />
- * A second launch will return FALSE<br />
- * <br />
- * Example:<br />
- * <code>
- * Scilab sci = new Scilab();<br />
- * sci.open(new File("/tmp/myscript.sce"));<br />
- * <br />
+ * Open a connection to the Scilab engine and run thefile scriptFilename<br>
+ * This function is based on Call_ScilabOpen from call_scilab<br>
+ * Note: For now, only one instance of Scilab can be launched<br>
+ * A second launch will return FALSE<br>
+ * <br>
+ * Example:<br>
+ * <code>
+ * Scilab sci = new Scilab();<br>
+ * sci.open(new File("/tmp/myscript.sce"));<br>
+ * <br>
* </code>
* @param scriptFilename The script to execute on startup
* @return if the operation is successful
@@ -255,13 +255,13 @@ public class Scilab {
/**
- * Execute a single command in Scilab<br />
+ * Execute a single command in Scilab<br>
* This function is based on SendScilabJob from call_scilab
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.exec("a=2*%pi");<br />
- * <br />
+ * sci.exec("a=2*%pi");<br>
+ * <br>
* </code>
* @param job the job to execute
* @return if the operation is successful
@@ -277,14 +277,14 @@ public class Scilab {
/**
- * Execute a single command in Scilab<br />
- * Returns a ScilabErrorException in case of Scilab problem<br />
+ * Execute a single command in Scilab<br>
+ * Returns a ScilabErrorException in case of Scilab problem<br>
* This function is based on SendScilabJob from call_scilab
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.exec("a=2*%pi");<br />
- * <br />
+ * sci.exec("a=2*%pi");<br>
+ * <br>
* </code>
* @param job the job to execute
* @since 5.4.0
@@ -298,13 +298,13 @@ public class Scilab {
/**
- * Execute several commands in Scilab<br />
+ * Execute several commands in Scilab<br>
* This function is based on SendScilabJob from call_scilab
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.exec(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<br />
- * <br />
+ * sci.exec(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<br>
+ * <br>
* </code>
* @param jobs the serie of job to execute
* @return if the operation is successful
@@ -319,14 +319,14 @@ public class Scilab {
}
/**
- * Execute several commands in Scilab<br />
- * Returns a ScilabErrorException in case of Scilab problem<br />
+ * Execute several commands in Scilab<br>
+ * Returns a ScilabErrorException in case of Scilab problem<br>
* This function is based on SendScilabJob from call_scilab
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.exec(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<br />
- * <br />
+ * sci.exec(new String[]{"a=42*2;","b=44*2", "c=(a==b)"});<br>
+ * <br>
* </code>
* @param jobs the serie of job to execute
* @since 5.4.0
@@ -339,17 +339,17 @@ public class Scilab {
}
/**
- * Execute a Scilab script .sce/.sci and throws an exception in case<br />
- * of a Scilab error<br />
- * Returns a ScilabErrorException in case of Scilab problem<br />
- * This function is based on SendScilabJob from call_scilab<br />
+ * Execute a Scilab script .sce/.sci and throws an exception in case<br>
+ * of a Scilab error<br>
+ * Returns a ScilabErrorException in case of Scilab problem<br>
+ * This function is based on SendScilabJob from call_scilab<br>
* Note that this function is a direct call on the Scilab function exec:
* <code> this.exec("exec('" + scriptFilename + "');");</code>
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.exec(new File("/tmp/myscript.sci"));<br />
- * <br />
+ * sci.exec(new File("/tmp/myscript.sci"));<br>
+ * <br>
* </code>
* @param scriptFilename the script to execute
* @since 5.4.0
@@ -362,16 +362,16 @@ public class Scilab {
}
/**
- * Execute a Scilab script .sce/.sci and throws an exception in case<br />
- * the file is not found<br />
- * This function is based on SendScilabJob from call_scilab<br />
+ * Execute a Scilab script .sce/.sci and throws an exception in case<br>
+ * the file is not found<br>
+ * This function is based on SendScilabJob from call_scilab<br>
* Note that this function is a direct call on the Scilab function exec:
* <code> this.exec("exec('" + scriptFilename + "');");</code>
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.exec(new File("/tmp/myscript.sci"));<br />
- * <br />
+ * sci.exec(new File("/tmp/myscript.sci"));<br>
+ * <br>
* </code>
* @param scriptFilename the script to execute
* @return if the operation is successful
@@ -386,14 +386,14 @@ public class Scilab {
/**
* Detect if a variable (varname) exists in Scilab
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
- * ScilabDouble aOriginal = new ScilabDouble(a);<br />
- * sci.put("a",aOriginal);<br />
- * assert sci.isExistingVariable("a") == true;<br />
- * <br />
+ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br>
+ * ScilabDouble aOriginal = new ScilabDouble(a);<br>
+ * sci.put("a",aOriginal);<br>
+ * assert sci.isExistingVariable("a") == true;<br>
+ * <br>
* </code>
* @param varname the variable to check
* @return if the variable exists or not
@@ -404,13 +404,13 @@ public class Scilab {
/**
- * Shutdown Scilab<br />
+ * Shutdown Scilab<br>
* This function is based on TerminateScilab from call_scilab
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.close();<br />
- * <br />
+ * sci.close();<br>
+ * <br>
* </code>
* @return if the operation is successful
*/
@@ -421,12 +421,12 @@ public class Scilab {
/**
* Return the last error code
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.open("a=1+"); // Wrong operation<br />
- * sci.getLastErrorCode() // Returns 2<br />
- * <br />
+ * sci.open("a=1+"); // Wrong operation<br>
+ * sci.getLastErrorCode() // Returns 2<br>
+ * <br>
* </code>
* @return the error code
*/
@@ -437,12 +437,12 @@ public class Scilab {
/**
* Return the last error message
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.open("a=1+");<br />
- * System.err.println(sci.getLastErrorMessage());<br />
- * <br />
+ * sci.open("a=1+");<br>
+ * System.err.println(sci.getLastErrorMessage());<br>
+ * <br>
* </code>
* @return the error message itself
*/
@@ -452,14 +452,14 @@ public class Scilab {
/**
- * Detect if a Scilab graphic window is still opened<br />
+ * Detect if a Scilab graphic window is still opened<br>
* This function is based on ScilabHaveAGraph from call_scilab
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.exec("plot3d();");<br />
- * sci.isGraphicOpened();<br />
- * <br />
+ * sci.exec("plot3d();");<br>
+ * sci.isGraphicOpened();<br>
+ * <br>
* </code>
* @return if the graphic is open or not
*/
@@ -469,14 +469,14 @@ public class Scilab {
/**
* Return the code type of a variable varname
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.exec("a = 2*%pi");<br />
- * if (sci.getVariableType("a") == ScilabTypeEnum.sci_matrix) {<br />
- * System.out.println("a is a double matrix");<br />
- * }<br />
- * <br />
+ * sci.exec("a = 2*%pi");<br>
+ * if (sci.getVariableType("a") == ScilabTypeEnum.sci_matrix) {<br>
+ * System.out.println("a is a double matrix");<br>
+ * }<br>
+ * <br>
* </code>
* @param varName the name of the variable
* @return the type of the variable
@@ -489,14 +489,14 @@ public class Scilab {
/**
* Return the code type of a variable varname in the current Scilab session
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * sci.exec("a = 2*%pi");<br />
- * if (sci.getVariableType("a") == ScilabTypeEnum.sci_matrix) {<br />
- * System.out.println("a is a double matrix");<br />
- * }<br />
- * <br />
+ * sci.exec("a = 2*%pi");<br>
+ * if (sci.getVariableType("a") == ScilabTypeEnum.sci_matrix) {<br>
+ * System.out.println("a is a double matrix");<br>
+ * }<br>
+ * <br>
* </code>
* @param varName the name of the variable
* @return the type of the variable
@@ -522,17 +522,17 @@ public class Scilab {
}
/**
- * Returns a variable named varname<br />
+ * Returns a variable named varname<br>
* Throws an exception if the datatype is not managed or if the variable is not available
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
- * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br />
- * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br />
- * sci.put("a",aOriginal);<br />
- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
- * <br />
+ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br>
+ * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br>
+ * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br>
+ * sci.put("a",aOriginal);<br>
+ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br>
+ * <br>
* </code>
* @param varname the name of the variable
* @return return the variable
@@ -543,17 +543,17 @@ public class Scilab {
}
/**
- * Returns a reference variable named varname<br />
+ * Returns a reference variable named varname<br>
* Throws an exception if the datatype is not managed or if the variable is not available
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
- * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br />
- * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br />
- * sci.put("a",aOriginal);<br />
- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
- * <br />
+ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br>
+ * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br>
+ * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br>
+ * sci.put("a",aOriginal);<br>
+ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br>
+ * <br>
* </code>
* @param varname the name of the variable
* @return return the variable
@@ -564,17 +564,17 @@ public class Scilab {
}
/**
- * Returns a variable named varname in the current Scilab session<br />
+ * Returns a variable named varname in the current Scilab session<br>
* Throws an exception if the datatype is not managed or if the variable is not available
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
- * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br />
- * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br />
- * sci.put("a",aOriginal);<br />
- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
- * <br />
+ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br>
+ * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br>
+ * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br>
+ * sci.put("a",aOriginal);<br>
+ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br>
+ * <br>
* </code>
* @param varname the name of the variable
* @return return the variable
@@ -585,17 +585,17 @@ public class Scilab {
}
/**
- * Returns a variable named varname in the current Scilab session<br />
+ * Returns a variable named varname in the current Scilab session<br>
* Throws an exception if the datatype is not managed or if the variable is not available
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br />
- * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br />
- * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br />
- * sci.put("a",aOriginal);<br />
- * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br />
- * <br />
+ * double [][]a={{21.2, 22.0, 42.0, 39.0},{23.2, 24.0, 44.0, 40.0}};<br>
+ * double [][]aImg={{212.2, 221.0, 423.0, 393.0},{234.2, 244.0, 441.0, 407.0}};<br>
+ * ScilabDouble aOriginal = new ScilabDouble(a, aImg);<br>
+ * sci.put("a",aOriginal);<br>
+ * ScilabDouble aFromScilab = (ScilabDouble)sci.get("a");<br>
+ * <br>
* </code>
* @param varname the name of the variable
* @return return the variable
@@ -639,16 +639,16 @@ public class Scilab {
}
/**
- * Send to Scilab a variable theVariable named varname<br />
+ * Send to Scilab a variable theVariable named varname<br>
* Throws an exception if the datatype is not managed or if the variable is not available
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * boolean [][]a={{true, true, false, false},{true, false, true, false}};<br />
- * ScilabBoolean aOriginal = new ScilabBoolean(a);<br />
- * sci.put("a",aOriginal);<br />
- * ScilabBoolean aFromScilab = (ScilabBoolean)sci.get("a");<br />
- * <br />
+ * boolean [][]a={{true, true, false, false},{true, false, true, false}};<br>
+ * ScilabBoolean aOriginal = new ScilabBoolean(a);<br>
+ * sci.put("a",aOriginal);<br>
+ * ScilabBoolean aFromScilab = (ScilabBoolean)sci.get("a");<br>
+ * <br>
* </code>
* @param varname the name of the variable
* @param theVariable the variable itself
@@ -660,16 +660,16 @@ public class Scilab {
}
/**
- * Send to the current Scilab session a variable theVariable named varname<br />
+ * Send to the current Scilab session a variable theVariable named varname<br>
* Throws an exception if the datatype is not managed or if the variable is not available
- * <br />
- * Example:<br />
+ * <br>
+ * Example:<br>
* <code>
- * boolean [][]a={{true, true, false, false},{true, false, true, false}};<br />
- * ScilabBoolean aOriginal = new ScilabBoolean(a);<br />
- * sci.put("a",aOriginal);<br />
- * ScilabBoolean aFromScilab = (ScilabBoolean)sci.get("a");<br />
- * <br />
+ * boolean [][]a={{true, true, false, false},{true, false, true, false}};<br>
+ * ScilabBoolean aOriginal = new ScilabBoolean(a);<br>
+ * sci.put("a",aOriginal);<br>
+ * ScilabBoolean aFromScilab = (ScilabBoolean)sci.get("a");<br>
+ * <br>
* </code>
* @param varname the name of the variable
* @param theVariable the variable itself
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java
@@ -24,9 +24,9 @@ import java.io.ObjectOutput;
* 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 />
+ * Example:<br>
* <code>
- * boolean [][]a={{true,false,true}, {true,true,true}};<br />
+ * boolean [][]a={{true,false,true}, {true,true,true}};<br>
* ScilabBoolean aMatrix = new ScilabBoolean(a);
* </code>
*
@@ -250,7 +250,7 @@ public class ScilabBoolean implements Sc
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return the pretty print
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabBooleanReference.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabBooleanReference.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabBooleanReference.java
@@ -23,9 +23,9 @@ import java.nio.IntBuffer;
* 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 />
+ * Example:<br>
* <code>
- * boolean [][]a={{true,false,true}, {true,true,true}};<br />
+ * boolean [][]a={{true,false,true}, {true,true,true}};<br>
* ScilabBoolean aMatrix = new ScilabBoolean(a);
* </code>
*
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java
@@ -370,7 +370,7 @@ public class ScilabBooleanSparse impleme
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return a Scilab-like String representation of the data.
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java
@@ -25,15 +25,15 @@ import java.io.ObjectOutput;
* 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 />
+ * 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 />
+ * 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>
- * Example (complex):<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 />
+ * 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>
*
@@ -406,7 +406,7 @@ public class ScilabDouble implements Sci
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return a Scilab-like String representation of the data.
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabDoubleReference.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabDoubleReference.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabDoubleReference.java
@@ -24,15 +24,15 @@ import java.nio.DoubleBuffer;
* 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 />
+ * 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 />
+ * 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>
- * Example (complex):<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 />
+ * 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>
*
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
@@ -23,9 +23,9 @@ import java.io.ObjectOutput;
* 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 />
+ * Example:<br>
* <code>
- * byte [][]a={{32,42,41}, {12,13,32}};<br />
+ * byte [][]a={{32,42,41}, {12,13,32}};<br>
* ScilabInteger aMatrix = new ScilabInteger(a, true); // true = unsigned
* </code>
*
@@ -832,7 +832,7 @@ public class ScilabInteger implements Sc
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return the pretty-printed values
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabIntegerReference.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabIntegerReference.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabIntegerReference.java
@@ -26,9 +26,9 @@ import java.nio.ShortBuffer;
* 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 />
+ * Example:<br>
* <code>
- * byte [][]a={{32,42,41}, {12,13,32}};<br />
+ * byte [][]a={{32,42,41}, {12,13,32}};<br>
* ScilabInteger aMatrix = new ScilabInteger(a, true); // true = unsigned
* </code>
*
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabList.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabList.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabList.java
@@ -25,11 +25,11 @@ import java.util.Collection;
* 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 />
+ * Example:<br>
* <code>
- * ScilabList data = new ScilabList();<br />
- * data.add(new ScilabString("hello"));<br />
- * data.add(new ScilabDouble(2));<br />
+ * ScilabList data = new ScilabList();<br>
+ * data.add(new ScilabString("hello"));<br>
+ * data.add(new ScilabDouble(2));<br>
* </code>
*
* @see org.scilab.modules.javasci.Scilab
@@ -188,7 +188,7 @@ public class ScilabList extends ArrayLis
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return the pretty-printed data
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabMList.java
@@ -27,11 +27,11 @@ import java.util.Map;
* 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 />
+ * Example:<br>
* <code>
- * ScilabMList data = new ScilabMList();<br />
- * data.add(new ScilabString("hello"));<br />
- * data.add(new ScilabDouble(2));<br />
+ * ScilabMList data = new ScilabMList();<br>
+ * data.add(new ScilabString("hello"));<br>
+ * data.add(new ScilabDouble(2));<br>
* </code>
*
* @see org.scilab.modules.javasci.Scilab
@@ -261,7 +261,7 @@ public class ScilabMList extends ArrayLi
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return the pretty-printed data
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabPolynomial.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabPolynomial.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabPolynomial.java
@@ -368,7 +368,7 @@ public class ScilabPolynomial implements
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return a Scilab-like String representation of the data.
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java
@@ -947,7 +947,7 @@ public class ScilabSparse implements Sci
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return a Scilab-like String representation of the data.
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabString.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabString.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabString.java
@@ -24,9 +24,9 @@ import java.util.Arrays;
* 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 />
+ * Example:<br>
* <code>
- * String [][]a={{"This","is","my","string"},{"and","I want to", "compare"," them"}};<br />
+ * String [][]a={{"This","is","my","string"},{"and","I want to", "compare"," them"}};<br>
* ScilabString aMatrix = new ScilabString(a);
* </code>
*
@@ -229,7 +229,7 @@ public class ScilabString implements Sci
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return a Scilab-like String representation of the data.
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabTList.java
@@ -27,11 +27,11 @@ import java.util.Map;
* 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 />
+ * Example:<br>
* <code>
- * ScilabTList data = new ScilabTList();<br />
- * data.add(new ScilabString("hello"));<br />
- * data.add(new ScilabDouble(2));<br />
+ * ScilabTList data = new ScilabTList();<br>
+ * data.add(new ScilabString("hello"));<br>
+ * data.add(new ScilabDouble(2));<br>
* </code>
*
* @see org.scilab.modules.javasci.Scilab
@@ -261,7 +261,7 @@ public class ScilabTList extends ArrayLi
}
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return the pretty-printed data
Index: scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabType.java
===================================================================
--- scilab-5.5.2.orig/modules/types/src/java/org/scilab/modules/types/ScilabType.java
+++ scilab-5.5.2/modules/types/src/java/org/scilab/modules/types/ScilabType.java
@@ -89,7 +89,7 @@ public interface ScilabType extends Exte
public Object getSerializedObject();
/**
- * Display the representation in the Scilab language of the type<br />
+ * Display the representation in the Scilab language of the type<br>
* Note that the representation can be copied/pasted straight into Scilab
*
* @return the pretty print
