Révision 3720

TXM/trunk/bundles/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 3720)
2339 2339

  
2340 2340
		// skip the process if the result is already in computing stage
2341 2341
		if (this.computing) {
2342
			Log.finest(NLS.bind("--- TXMResult.compute(): {0}: The result is already computing, compute process aborted.", this.getClass().getSimpleName())); // $NON-NLS-1$
2342
			Log.finest(NLS.bind("--- TXMResult.compute(): {0}: The result is already computing, computing process aborted.", this.getClass().getSimpleName())); // $NON-NLS-1$
2343 2343
			return true;
2344 2344
		}
2345 2345

  
......
2576 2576
		if (this.computing) {
2577 2577

  
2578 2578
			// set back to dirty
2579
			this.dirty = true;
2579
			this.setDirty();
2580 2580
			this.computing = false;
2581 2581

  
2582
			// FIXME: SJ: old code, used when the monitor was stored in the TXMResult, need to check if we need a replacement for this
2583
			// this.monitorSetCanceled(true);
2584
			// this.monitor = null;
2585

  
2586 2582
			Log.finest(NLS.bind("Computing state of {0} ({1}) has been reset...", this.getName(), this.getClass().getSimpleName()));
2587 2583

  
2588 2584
			// deep canceling
......
2639 2635

  
2640 2636

  
2641 2637

  
2642
	//
2643 2638
	/**
2644
	 * @Deprecated
2645
	 * 			FIXME: SJ: should be moved in an exporter extension
2646 2639
	 * 
2640
	 * 			
2641
	 * 
2647 2642
	 *             wrapper to ensure the result is ready to be computed (not computing, computed)
2648 2643
	 * 
2649 2644
	 * @param outfile
......
2653 2648
	 * @return
2654 2649
	 * @throws Exception
2655 2650
	 */
2651
	@Deprecated
2652
	//FIXME: SJ: should be moved in an exporter extension
2656 2653
	public final boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception {
2657 2654
		if (isComputing()) {
2658 2655
			Log.warning("The result is currently being computed. Please wait before exporting.");
......
2666 2663
	}
2667 2664

  
2668 2665
	/**
2669
	 * @Deprecated
2670
	 * 			// FIXME: SJ: should be moved in an exporter extension
2671 2666
	 * 
2672 2667
	 *             TXMResults must implement this method to be exported.
2673 2668
	 * 
......
2678 2673
	 * @return
2679 2674
	 * @throws Exception
2680 2675
	 */
2676
	@Deprecated
2677
	//FIXME: SJ: should be moved in an exporter extension
2681 2678
	protected abstract boolean _toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception;
2682 2679

  
2683 2680

  
TXM/trunk/bundles/org.txm.core/src/java/org/txm/objects/Workspace.java (revision 3720)
281 281
			IWorkspace rcpWorkspace = ResourcesPlugin.getWorkspace();
282 282
			// rcpWorkspace.getRoot().refreshLocal(1, new LogMonitor());
283 283

  
284
			IProjectDescription description = rcpWorkspace.loadProjectDescription(new Path(binCorpusDir.getAbsolutePath() + "/.project"));
284
			IProjectDescription description = rcpWorkspace.loadProjectDescription(new Path(binCorpusDir.getAbsolutePath() + "/.project")); //$NON-NLS-1$
285 285
			description.setLocation(new Path(binCorpusDir.getAbsolutePath()));
286 286
			IProject rcpProject = rcpWorkspace.getRoot().getProject(description.getName());
287 287

  

Formats disponibles : Unified diff