Révision 1786

tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java (revision 1786)
105 105
 * TODO : remove unused variables from workspace.
106 106
 * 
107 107
 * @author Sylvain Loiseau <sloiseau@ens-lsh.fr>
108
 * 
108 109
 */
109 110

  
110 111
public final class RWorkspace {
......
1134 1135
		} catch (RserveException e) {
1135 1136
			throw new RWorkspaceException(e);
1136 1137
		}
1137
		Log.finest("WORKSPACE_PURGED"); //$NON-NLS-1$
1138
		Log.finest("R WORKSPACE_PURGED"); //$NON-NLS-1$
1138 1139
	}
1139 1140

  
1140 1141
	/**
......
1507 1508
		} catch (RserveException e) {
1508 1509
			throw new RWorkspaceException(e);
1509 1510
		}
1510
		Log.finest("VARIABLE_REMOVED: " + new Object[] { variableName }); //$NON-NLS-1$
1511
		Log.finest("R VARIABLE_REMOVED: " + new Object[] { variableName }); //$NON-NLS-1$
1511 1512
	}
1512 1513

  
1513 1514
	/**
1514 1515
	 * Casts the specified REXP to a displayable object.
1516
	 * 
1515 1517
	 * @param rexp
1516
	 * @return
1518
	 * @return the casted object : String, int, etc.
1517 1519
	 */
1518 1520
	public Object getCastedREXP(REXP rexp)	{
1519 1521
		try {
......
1542 1544
				}
1543 1545
			}
1544 1546
			else if (rexp instanceof org.rosuda.REngine.REXPNull) {
1545
				return "NULL";
1547
				return "NULL"; //$NON-NLS-1$
1546 1548
			}
1547 1549
		}
1548 1550
		catch (REXPMismatchException e) {
......
1562 1564
	 * @throws REXPMismatchException the rEXP mismatch exception
1563 1565
	 */
1564 1566
	public REXP safeEval(String expr) throws RserveException, RException, REXPMismatchException {
1565
		if (logging && inputLogger != null ) inputLogger.printMessage(expr); //$NON-NLS-1$
1567
		if (logging && inputLogger != null ) {
1568
			inputLogger.printMessage(expr);
1569
		}
1566 1570
		lastSafeevalExpr = expr;
1567 1571
		
1568 1572
		expr = "try({" + expr + "}, silent=FALSE)";
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java (revision 1786)
49 49
 *
50 50
 * @author Sylvain Loiseau
51 51
 */
52
//FIXME: SJ: this class doesn't work anymore
53
//FIXME: SJ: this souldn't inherit from TXMEditor
52 54
public abstract class SVGGraphicEditor extends TXMEditor<TXMResult> {
53 55

  
54 56
	/** Linking with the OutlineView. */
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/SVGGraphicEditorInput.java (revision 1786)
41 41
 * 
42 42
 * @author Sylvain Loiseau,mdecorde
43 43
 */
44
// FIXME: SJ: this class doesn't work anymore
45
// FIXME: SJ: this souldn't inherit from TXMResultEditorInput
44 46
public class SVGGraphicEditorInput extends TXMResultEditorInput<TXMResult> implements IEditorInput, SVGGraphicable {
45 47

  
46 48
	/** The filename. */
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenSVGGraph.java (revision 1786)
50 50
/**
51 51
 * open a SVG file in an editor @ author mdecorde.
52 52
 */
53
//FIXME: SJ: this class doesn't work anymore
54
//FIXME: SJ: this souldn't use TXMEditor system
53 55
public class OpenSVGGraph extends AbstractHandler {
54 56

  
55 57
	private static final String ID = "org.txm.rcp.commands.OpenSVGGraph"; //$NON-NLS-1$
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenGraph.java (revision 1786)
48 48
/**
49 49
 * Open the graphics editor. It can open SVN, PNG, etc depending on the Device given.
50 50
 */
51
@Deprecated
52
// FIXME: to move to org.txm.chartsengine.svgbatik.rcp
51

  
53 52
public class OpenGraph extends AbstractHandler {
54 53

  
55 54
	private static final String ID = "org.txm.rcp.commands.OpenGraph"; //$NON-NLS-1$
......
103 102
	 * Open file.
104 103
	 *
105 104
	 * @param filepath the filepath
106
	 * @param device the device
107
	 * @return the i editor part
108
	 */
109
//	@Deprecated
110
//	// FIXME: this method is R charts engine dependent. But it seems to no be used so we may remove it
111
//	public static IEditorPart OpenFile(String filepath, RDevice device) {
112
//		return OpenFile(filepath, new File(filepath).getName(), device, null);
113
//	}
114
//
115
//	/**
116
//	 * Open file.
117
//	 *
118
//	 * @param file the file
119
//	 * @param device the device
120
//	 * @return the i editor part
121
//	 */
122
//	@Deprecated
123
//	// FIXME: this method is R charts engine dependent. But it seems to no be used so we may remove it
124
//	public static IEditorPart OpenFile(File file, RDevice device) {
125
//		return OpenFile(file.getAbsolutePath(), file.getName(), device, null);
126
//	}
127

  
128
	/**
129
	 * Open file.
130
	 *
131
	 * @param filepath the filepath
132 105
	 * @param editorname the editorname
133 106
	 * @return the i editor part
134 107
	 */

Formats disponibles : Unified diff