/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

Révision 2632

tmp/org.txm.core/src/java/org/txm/core/engines/ImportEngine.java (revision 2632)
4	4	import org.eclipse.core.runtime.IStatus;
5	5	import org.txm.core.results.TXMResult;
6	6	import org.txm.objects.Project;
7		import org.txm.utils.TXMProgressMonitor;
8	7
9	8	public abstract class ImportEngine implements Engine {
10	9

     		this.hasBeenComputedOnce = true;
     		this.setVisible(false);
     		initRCPStuffs(new TXMProgressMonitor());
     		initRCPStuffs(new LogMonitor());
     		if (isOpen()) {
     			this.autoSaveParametersFromAnnotations();
     			this.saveParameters();
-...
+    		}
+    	}
     	/**
     	 * Instantiates a new existing project from persistence.
     	 * This project will not be builded, main corpus, texts, editions, etc. will be restored from persistence.
+    	 *
     	 * @param nodePath
     	 * @throws CoreException
     	 */
     	public Project(String parametersNodePath) throws CoreException {
     		super(parametersNodePath);
     		this.needToBuild = false;
     		this.dirty = false;
     		this.hasBeenComputedOnce = true;
     		this.setVisible(false);
     		initRCPStuffs(new LogMonitor());
     		//
     		// this.setPath(project.getPath() + getName());
     		// params = parameters;
     		// setSelfElement(params.root);
     		// this.project = project;
     		// //load();
     		// this.userName = params.name;
     		// if (!userName.equals(userName.toUpperCase())) {
     		// System.out.println("Warning in Base.init: binary corpus name contains lower case letters: "+this.userName);
     		// }
     		//
     		// this.scope = new BasePreferenceScope(this);
     		// reloading existing results
     		this.loadResults(null);
+    	}
     	/**
     	 * Instantiates a new project that needs to build its main corpus, texts, editions, etc..
+    	 *
     	 * @param workspace
-...
     		if (rcpProject != null && !rcpProject.isOpen()) {
     			try {
     				TXMProgressMonitor subMonitor = new TXMProgressMonitor(monitor);
     				subMonitor.setTask("Openning project");
     				monitor.beginTask("Openning project", 100);
     				rcpProject.open(monitor);
     				initRCPStuffs(subMonitor);
     				initRCPStuffs(monitor);
     				subMonitor.setTask("loading results");
     				monitor.subTask("Loading results");
     				this.loadResults(null);
-...
+    					}
+    				}
     				subMonitor.setTask("");
     				monitor.setTaskName("");
+    			}
     			catch (CoreException e) {
     				e.printStackTrace();
-...
     		return version;
+    	}
     	/**
     	 * Instantiates a new existing project from persistence.
     	 * This project will not be builded, main corpus, texts, editions, etc. will be restored from persistence.
+    	 *
     	 * @param nodePath
     	 * @throws CoreException
     	 */
     	public Project(String parametersNodePath) throws CoreException {
     		super(parametersNodePath);
     		this.needToBuild = false;
     		this.dirty = false;
     		this.hasBeenComputedOnce = true;
     		this.setVisible(false);
     		initRCPStuffs(new TXMProgressMonitor());
     		//
     		// this.setPath(project.getPath() + getName());
     		// params = parameters;
     		// setSelfElement(params.root);
     		// this.project = project;
     		// //load();
     		// this.userName = params.name;
     		// if (!userName.equals(userName.toUpperCase())) {
     		// System.out.println("Warning in Base.init: binary corpus name contains lower case letters: "+this.userName);
     		// }
     		//
     		// this.scope = new BasePreferenceScope(this);
     		// reloading existing results
     		this.loadResults(null);
+    	}
     	@Override
     	public boolean isInternalPersistable() {
     		return true;
-...
     				return true;
+    			}
     			SubMonitor subMonitor = SubMonitor.convert(new LogMonitor(), "computing " + this, 100);
     			Log.finest("RUNNING IMPORT MODULE WITH NAME = " + getImportModuleName());
     			boolean state = engine.build(this, subMonitor).isOK();
     			boolean state = engine.build(this, monitor.internalGetSubMonitor()).isOK();
     			if (state == true) {
     				this.needToBuild = false;
     				// This step could be done only if the compiler step if done and only if it modifying/deleting the corpus builds
-...
+    	 *
     	 * @throws CoreException
     	 */
     	private void initRCPStuffs(TXMProgressMonitor monitor) throws CoreException {
     	private void initRCPStuffs(IProgressMonitor monitor) throws CoreException {
     		IWorkspace rcpWorkspace = ResourcesPlugin.getWorkspace();
     		if (this.rcpProject == null) {
     			String n = this.getName();
-...
+    		}
+    	}
     	private void createRCPProject(TXMProgressMonitor monitor) throws CoreException {
     	private void createRCPProject(IProgressMonitor monitor) throws CoreException {
     		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(rcpProject.getName());
     		IFolder folder = Workspace.getInstance().corporaProject.getFolder(rcpProject.getName());
-...
     		description.setLocation(folder.getLocation());
     		description.setNatureIds(new String[] { TXMCORPUSNATURE });
     		// SubMonitor subMonitor = monitor.createNewMonitor(100);
     		IProgressMonitor subMonitor = new LogMonitor();
     		rcpProject.create(description, subMonitor);
     		rcpProject.open(subMonitor);
     		rcpProject.create(description, monitor);
     		rcpProject.open(monitor);
     		// TODO might fail if corpus source directory changed
     		IFolder srcFolder = rcpProject.getFolder("src");
     		if (pSrcDirectory != null && !pSrcDirectory.getName().isEmpty()) {
     			IPath path = new Path(pSrcDirectory.getAbsolutePath());
     			if (!srcFolder.exists()) {
     				srcFolder.createLink(path, IResource.ALLOW_MISSING_LOCAL, subMonitor);
     				srcFolder.createLink(path, IResource.ALLOW_MISSING_LOCAL, monitor);
+    			}
+    		}
+    	}

     		return new TXMProgressMonitor(this.monitor.split(totalWork));
+    	}
     	/**
     	 * Returns the instance of the internal {@link SubMonitor}.
     	 * Using this {@link SubMonitor} may leads to redefine the main task.
+    	 *
     	 * @return the instance of the internal {@link SubMonitor}
     	 */
     	public SubMonitor internalGetSubMonitor() {
     		return this.monitor;
+    	}
+    }

tmp/org.txm.core/src/java/org/txm/utils/LogMonitor.java (revision 2632)
6	6	import org.txm.utils.logger.Log;
7	7
8	8	/**
9		* A silent monitor only loggin INFO level messages
	9	* A silent monitor that logs in console FINE level messages only.
10	10	*
11	11	* @author mdecorde
12	12	*

Formats disponibles : Unified diff

Laboratoire ICAR » Plateforme TXM

Révision 2632