Révision 1124

tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToMatchable.java (revision 1124)
71 71
			}
72 72
			
73 73
			// create a local result node in the project node, store in some parameters and call the linked command
74
			String resultParametersNodePath = this.getResultParent(event).getProject().getParametersNodeRootPath() + TXMResult.createUUID();
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 75
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.PARENT_UUID, this.getResultParent(event).getUUID());
76 76
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.MATCHES, matches.toString());
77 77
			
tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToQueryable.java (revision 1124)
79 79
			}
80 80
			
81 81
			// create a local result node in the project node, store in some parameters and call the linked command
82
			String resultParametersNodePath = this.getResultParent(event).getProject().getParametersNodeRootPath() + TXMResult.createUUID();
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 83
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.PARENT_UUID, this.getResultParent(event).getUUID());
84 84
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.QUERY, query);
85 85
			TXMPreferences.put(resultParametersNodePath, TXMPreferences.QUERIES, queries);
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java (revision 1124)
57 57

  
58 58
		Progression progression = null;
59 59
		
60
		// From link: creating from UUID and preferences nodes
61
		String uuid = event.getParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH);
62
		if (uuid != null && !uuid.isEmpty()) {
63
			progression = new Progression(uuid);
60
		// From link: creating from parameter node
61
		String parametersNodePath = event.getParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH);
62
		if (parametersNodePath != null && !parametersNodePath.isEmpty()) {
63
			progression = new Progression(parametersNodePath);
64 64
		}
65 65
		// From view result node
66 66
		else	{
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java (revision 1124)
58 58
		
59 59
		Concordance concordance = null;
60 60

  
61
		// From link: creating from UUID and preferences node
62
		String uuid = event.getParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH);
63
		if (uuid != null && !uuid.isEmpty()) {
64
			concordance = new Concordance(uuid);
61
		// From link: creating from parameter node
62
		String parametersNodePath = event.getParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH);
63
		if (parametersNodePath != null && !parametersNodePath.isEmpty()) {
64
			concordance = new Concordance(parametersNodePath);
65 65
		}
66 66
		// From view result node
67 67
		else	{
tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java (revision 1124)
1314 1314
		
1315 1315
			Arrays.sort(nodesNames);
1316 1316
			for (String nodeName : nodesNames) {
1317
				Log.finest("TXMPreferences.getAllResultsNodePaths(): node name = " + nodeName);
1317
				// Debug
1318
//				Log.finest("TXMPreferences.getAllResultsNodePaths(): node name = " + nodeName);
1318 1319
				
1319 1320
				if(nodeName.startsWith(TXMResult.UUID_PREFIX))	{
1320 1321
					// Debug
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1124)
280 280

  
281 281
	public void setUserName(String name) {
282 282
		userName = name;
283
		//this.saveParameter(TXMPreferences.NAME, name);
284 283
	}
285 284

  
286 285

  
......
379 378

  
380 379
		List<Field> fields = new ArrayList<Field>();
381 380
		Class<?> clazz = this.getClass();
381
		
382 382
		while (clazz != Object.class) {
383 383
			fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
384 384
			clazz = clazz.getSuperclass();
385 385
		}
386 386

  
387 387
		return fields;
388

  
389 388
	}
390 389

  
391 390
	/**
......
527 526
		str.append("\nDefault command preferences\n"); //$NON-NLS-1$
528 527
		str.append(TXMPreferences.getKeysAndValues(DefaultScope.INSTANCE + "/" + this.commandPreferencesNodePath));
529 528

  
530

  
531

  
532 529
		return str.toString();
533 530
	}
534 531

  
......
603 600
			return;
604 601
		}
605 602
		if (lastValue == null || !lastValue.equals(newValue)) {
606
			Log.info("Setting dirty to true: old = "+ lastValue + " / new = " + newValue);
603
			Log.info("Setting dirty to true: last = "+ lastValue + " / new = " + newValue);
607 604
			this.setDirty();
608 605
		}
609 606
	}
......
1716 1713
			// TODO where do we put this parent compute ? :o
1717 1714
			//		if (parent != null && !parent.getHasBeenComputedOnce()) { // parent must be computed at least one time
1718 1715
			// SJ: other way, test the object itself
1719
			if (this.parent != null && !(this.parent instanceof Project)) { 
1716
			if (this.parent != null && !(this.parent instanceof Project)) {
1720 1717
				if (!this.parent.compute(monitor, false, updateLastParameters)) {
1721 1718
					Log.severe("TXMResult.compute(): " + this.getClass().getSimpleName() + ": failed to compute parent result.");
1722 1719

  
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/handlers/ComputeSpecifities.java (revision 1124)
73 73
				// creating from Partition
74 74
				if (selection instanceof Partition) {
75 75
					Partition partition = (Partition) selection;
76
					//lexicalTable = LexicalTableFactory.getLexicalTable(partition, partition.getCorpus().getProperty(defautProperty), fMin);
77
					//lexicalTable = new LexicalTable(partition, partition.getCorpus().getDefaultProperty(), fMin, vMax);
78 76
					lexicalTable = new LexicalTable(partition);
79 77
				}
80 78
				// creating from Subcorpus
81 79
				else if (selection instanceof Subcorpus) {
82 80
					Subcorpus corpus = (Subcorpus) selection;
83
					//lexicalTable = LexicalTableFactory.getLexicalTable(corpus, corpus.getProperty(defautProperty));
84 81
					lexicalTable = new LexicalTable(corpus, corpus.getDefaultProperty());
85 82
				}
86 83
				// creating from Lexical Table
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java (revision 1124)
271 271
		} else {
272 272
			_compute_with_lists();
273 273
		}
274
		
275
		//FIXME: temporary fix, compute all the children parts
276
//		List<Part> parts = (List<Part>)getChildren(Part.class);
277
//		for (int i = 0; i < parts.size(); i++) {
278
//			parts.get(i).compute(this, true);
279
//		}
280
		
274 281
		return true;
275 282
	}
276 283

  
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java (revision 1124)
70 70

  
71 71
		Cooccurrence cooc = null;
72 72

  
73
		// From link: creating from UUID and preferences nodes
74
		String uuid = event.getParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH);
75
		if (uuid != null && !uuid.isEmpty()) {
76
			cooc = new Cooccurrence(uuid);
73
		// From link: creating from parameters node
74
		String parametersNodePath = event.getParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH);
75
		if (parametersNodePath != null && !parametersNodePath.isEmpty()) {
76
			cooc = new Cooccurrence(parametersNodePath);
77 77
		}
78 78
		// From view result node
79 79
		else {

Formats disponibles : Unified diff