Révision 1182

tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java (revision 1182)
89 89
	// essentially for Links and Persistence
90 90
	public final static String RESULT_PARAMETERS_NODE_PATH = "result_parameters_node_path"; //$NON-NLS-1$
91 91
	//public final static String RESULT_UUID = "result_uuid"; //$NON-NLS-1$
92
	public final static String PARENT_UUID = "parent_parameters_node_path"; //$NON-NLS-1$
92
	public final static String PARENT_PARAMETERS_NODE_PATH = "parent_parameters_node_path"; //$NON-NLS-1$
93 93
	public final static String BUNDLE_ID = "bundle_id"; //$NON-NLS-1$
94 94
	public final static String USER_NAME = "user_name"; //$NON-NLS-1$
95 95
	public final static String LAZY_NAME = "lazy_name"; //$NON-NLS-1$
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1182)
229 229

  
230 230

  
231 231
		// retrieving parent from UUID
232
		String parentNodePath = this.getStringParameterValue(TXMPreferences.PARENT_UUID);
232
		String parentNodePath = this.getStringParameterValue(TXMPreferences.PARENT_PARAMETERS_NODE_PATH);
233 233

  
234 234
		//System.out.println("TXMResult.TXMResult(): parent UUID = " + parentUUID);
235 235

  
......
883 883
		this.saveParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH, this.parametersNodePath);
884 884
		this.saveParameter(TXMPreferences.BUNDLE_ID, this.commandPreferencesNodePath);
885 885
		if (this.parent != null)	{
886
			this.saveParameter(TXMPreferences.PARENT_UUID, this.parent.getParametersNodePath());
886
			this.saveParameter(TXMPreferences.PARENT_PARAMETERS_NODE_PATH, this.parent.getParametersNodePath());
887 887
		}
888 888

  
889 889
		this.lazyName = this.getSimpleName();
tmp/org.txm.core/src/java/org/txm/objects/Project.java (revision 1182)
405 405
				}
406 406
				Log.finest("Project.loadResults(): class = " + className); //$NON-NLS-1$
407 407
				//					Log.finest("Toolbox.initialize(): parent_uuid = " + TXMPreferences.getString(TXMPreferences.PARENT_UUID, nodeQualifier));
408
				Log.finest("Project.loadResults(): parent_uuid = " + TXMPreferences.preferencesRootNode.node(parametersNodePath).get(TXMPreferences.PARENT_UUID, "")); //$NON-NLS-1$
408
				Log.finest("Project.loadResults(): parent_uuid = " + TXMPreferences.preferencesRootNode.node(parametersNodePath).get(TXMPreferences.PARENT_PARAMETERS_NODE_PATH, "")); //$NON-NLS-1$
409 409
				String bundleId = TXMPreferences.preferencesRootNode.node(parametersNodePath).get(TXMPreferences.BUNDLE_ID, ""); //$NON-NLS-1$
410 410
				Log.finest("Project.loadResults(): bundle_id = " + bundleId); //$NON-NLS-1$
411 411
				Bundle bundle = Platform.getBundle(bundleId);
......
1189 1189
				//TXMPreferences.dump();
1190 1190

  
1191 1191
				Log.finest("Toolbox.initialize(): class = " + className); //$NON-NLS-1$
1192
				Log.finest("Toolbox.initialize(): parent_uuid = " + TXMPreferences.preferencesRootNode.node(parametersNodePath).get(TXMPreferences.PARENT_UUID, "")); //$NON-NLS-1$
1192
				Log.finest("Toolbox.initialize(): parent_uuid = " + TXMPreferences.preferencesRootNode.node(parametersNodePath).get(TXMPreferences.PARENT_PARAMETERS_NODE_PATH, "")); //$NON-NLS-1$
1193 1193
				String bundleId = TXMPreferences.preferencesRootNode.node(parametersNodePath).get(TXMPreferences.BUNDLE_ID, ""); //$NON-NLS-1$
1194 1194
				Log.finest("Toolbox.initialize(): bundle_id = " + bundleId); //$NON-NLS-1$
1195 1195
				Bundle bundle = Platform.getBundle(bundleId);
tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToMatchable.java (revision 1182)
72 72
			
73 73
			// create a local result node in the project node, store in some parameters and call the linked command
74 74
			String resultParametersNodePath = this.getResultParent(event).getProject().getParametersNodeRootPath() + TXMResult.createUUID() + "_link"; // FIXME: we can't put the class name here since we does not know the target class
75
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.PARENT_UUID, this.getResultParent(event).getParametersNodePath());
75
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.PARENT_PARAMETERS_NODE_PATH, this.getResultParent(event).getParametersNodePath());
76 76
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.MATCHES, matches.toString());
77 77
			
78 78
			BaseAbstractHandler.executeSendToCommand(event.getCommand().getId(), resultParametersNodePath);
tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToQueryable.java (revision 1182)
80 80
			
81 81
			// create a local result node in the project node, store in some parameters and call the linked command
82 82
			String resultParametersNodePath = this.getResultParent(event).getProject().getParametersNodeRootPath() + TXMResult.createUUID() + "_link"; // FIXME: we can't put the class name here since we does not know the target class
83
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.PARENT_UUID, this.getResultParent(event).getParametersNodePath());
83
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.PARENT_PARAMETERS_NODE_PATH, this.getResultParent(event).getParametersNodePath());
84 84
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.QUERY, query);
85 85
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.QUERIES, queries);
86 86
			
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java (revision 1182)
1067 1067
	 * @return the rEXP
1068 1068
	 * @throws RWorkspaceException the r workspace exception
1069 1069
	 */
1070
	public REXP eval(String exp) throws RWorkspaceException {
1070
	public synchronized REXP eval(String exp) throws RWorkspaceException {
1071 1071
		REXP res = null;
1072 1072
		try {
1073 1073
			res = safeEval(exp);

Formats disponibles : Unified diff