Révision 1720

tmp/org.txm.core/src/java/org/txm/Toolbox.java (revision 1720)
293 293

  
294 294
		// loads and recreate the existing projects, loadParameters() needs engines to be ready
295 295
		if (workspace != null) {
296
			if (monitor != null) {
297
				monitor.setTaskName("Initializing corpora...");
298
			}
296 299
			workspace.loadProjectsFromProjectScopes();
297 300
		} else {
298 301
			System.out.println("Error: Toolbox not correctly initialized. Aborting workspace initialization.");
299 302
		}
300 303

  
301 304
		initializing = false;
305
		if (monitor != null) {
306
			monitor.setTaskName("");
307
		}
302 308
		return checkState();
303 309
	}
304 310

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties (revision 1720)
676 676
outsidetextToedit = Hors texte à éditer
677 677

  
678 678
p0Import = Import {0}
679

  
679
p0ImportWithP1 = Import {1} de {0}
680 680
p0ParametersInput = Saisie des paramètres de {0}
681 681

  
682 682
p0ScriptFileDoesntExist = ** Le fichier de script {0} n''existe pas.
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java (revision 1720)
511 511

  
512 512
	public static String theP1P0CorpusWillBeReplaced;
513 513

  
514
	public static String installingPreviousCorpusFromP0; 
514
	public static String installingPreviousCorpusFromP0;
515 515

  
516
	public static String p0ImportWithP1; 
517

  
516 518
	static {
517 519
		// initialize resource bundle
518 520
		Utf8NLS.initializeMessages(BUNDLE_NAME, TXMUIMessages.class);
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 1720)
675 675

  
676 676
outsidetextToedit = Out of text to edit
677 677

  
678
p0Import = {0} Import
678
p0Import = {0} Import
679

  
680
p0ImportWithP1 = {0} import with {1}
679 681

  
680 682
p0ParametersInput = {0} parameters input
681 683

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportFormEditor.java (revision 1720)
109 109

  
110 110
	}
111 111

  
112
	public void firePropertyChange(int propertyId) {
113
		super.firePropertyChange(propertyId);
114
	}
115
	
112 116
	/**
113 117
	 * Inits the.
114 118
	 *
......
187 191
	 */
188 192
	@Override
189 193
	public String getPartName() {
190
		String name = TXMUIMessages.bind(TXMUIMessages.p0Import,ImportModuleCustomization.getName(groovyscript.getName()));
191
		return name;
194
		if (main != null && main.getProject() != null) {
195
			return TXMUIMessages.bind(TXMUIMessages.p0ImportWithP1,main.getProject().getName(),ImportModuleCustomization.getName(groovyscript.getName()));
196
		} else {
197
			return TXMUIMessages.bind(TXMUIMessages.p0Import,ImportModuleCustomization.getName(groovyscript.getName()));
198
		}
192 199
	}
193 200
	
194 201
	/* (non-Javadoc)
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java (revision 1720)
44 44
import org.eclipse.swt.layout.RowLayout;
45 45
import org.eclipse.swt.widgets.Composite;
46 46
import org.eclipse.swt.widgets.Label;
47
import org.eclipse.ui.IEditorPart;
48
import org.eclipse.ui.IWorkbenchPartConstants;
47 49
import org.eclipse.ui.forms.IManagedForm;
48 50
import org.eclipse.ui.forms.editor.FormPage;
49 51
import org.eclipse.ui.forms.events.HyperlinkAdapter;
......
1016 1018
			loadParams();
1017 1019

  
1018 1020
			this.editor.getMetaPage().reload();
1019
			
1021
			this.editor.firePropertyChange(IEditorPart.PROP_TITLE);
1020 1022
		} catch (Exception e1) {
1021 1023
			org.txm.utils.logger.Log.printStackTrace(e1);
1022 1024
		}
......
1104 1106
		if (project.getSrcdir() == null) return null;
1105 1107
		return project.getSrcdir().getAbsolutePath();
1106 1108
	}
1109

  
1110
	public Project getProject() {
1111
		return project;
1112
	}
1107 1113
}

Formats disponibles : Unified diff