Révision 1610

tmp/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/SourceDirectoryPage.java (revision 1610)
39 39
	public SourceDirectoryPage() {
40 40
		super("Select source directory");
41 41
		setTitle("Sources");
42
		setDescription("The source directory contains the sources files.");
42
		setDescription("The source directory contains the sources files read by the import module.");
43 43
	}
44 44

  
45 45
	@Override
tmp/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/ProjectNamePage.java (revision 1610)
1 1
package org.txm.rcp.corpuswizard;
2 2

  
3
import org.eclipse.core.resources.ResourcesPlugin;
4 3
import org.eclipse.jface.wizard.WizardPage;
5 4
import org.eclipse.swt.SWT;
6
import org.eclipse.swt.events.KeyEvent;
7
import org.eclipse.swt.events.KeyListener;
8 5
import org.eclipse.swt.events.ModifyEvent;
9 6
import org.eclipse.swt.events.ModifyListener;
10 7
import org.eclipse.swt.events.SelectionEvent;
......
16 13
import org.eclipse.swt.widgets.DirectoryDialog;
17 14
import org.eclipse.swt.widgets.Label;
18 15
import org.eclipse.swt.widgets.Text;
19
import org.txm.core.preferences.TXMPreferences;
20 16
import org.txm.rcp.preferences.RCPPreferences;
21 17

  
22 18
public class ProjectNamePage extends WizardPage {
......
29 25
    public ProjectNamePage() {
30 26
        super("Select source directory");
31 27
        setTitle("Sources");
32
        setDescription("The source directory contains the sources files.");
28
        setDescription("The source directory contains the sources files read by the import module.");
33 29
    }
34 30

  
35 31
    @Override
tmp/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/ImportWizard.java (revision 1610)
1 1
package org.txm.rcp.corpuswizard;
2 2

  
3 3
import java.io.File;
4
import java.util.Calendar;
4 5
import java.util.Locale;
5 6

  
6 7
import org.eclipse.jface.viewers.IStructuredSelection;
......
9 10
import org.eclipse.ui.INewWizard;
10 11
import org.eclipse.ui.IWorkbench;
11 12
import org.txm.Toolbox;
13
import org.txm.core.results.TXMResult;
12 14
import org.txm.objects.EditionDefinition;
13 15
import org.txm.objects.Project;
16
import org.txm.rcp.messages.TXMUIMessages;
14 17

  
15 18
public class ImportWizard extends Wizard implements INewWizard {
16 19

  
......
60 63
						project = new Project(Toolbox.workspace, name);
61 64
					}
62 65
					project.setSourceDirectory(path.getAbsolutePath());
63
					project.setDescription(page1.getDescription());
66
					project.setDescription(System.getProperty("user.name")+"\n"+TXMResult.PRETTY_LOCALIZED_TIME_FORMAT.format(Calendar.getInstance().getTime()));
64 67
					project.setLang(Locale.getDefault().getCountry());
65
					System.out.println(NLS.bind("The {0} corpus will be created.", project));
68
					System.out.println(NLS.bind(TXMUIMessages.theP0CorpusWillBeCreatedFromTheP1Directory, project.getName(), project.getProjectDirectory()));
66 69
				} else {
67
					System.out.println(NLS.bind("The {0} ({1}) corpus will be replaced.", project, project.getLastComputingDate()));
70
					System.out.println(NLS.bind(TXMUIMessages.theP1P0CorpusWillBeReplaced, project, project.getLastComputingDate()));
68 71
				}
69 72
				
70 73
				//project.compute(); // create/update files
......
78 81
				
79 82
				File importxml = new File(page1.getSourcePath(), "import.xml");
80 83
				if (importxml.exists()) {
81
					System.out.println("Warning: old TXM source directory containing an import.xml file found. Settings import parameters using this file.");
84
					//System.out.println("Warning: old TXM source directory containing an import.xml file found. Settings import parameters using this file.");
82 85
					//BaseOldParameters params = new BaseOldParameters(importxml);
83 86
					//project._load(params);
84 87
				}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java (revision 1610)
202 202
		homeBtn.setLayoutData(widgetData);
203 203

  
204 204
		// the explorer
205
		tv = new TreeViewer(parent);
205
		tv = new TreeViewer(parent, SWT.VIRTUAL);
206 206
		tv.setContentProvider(new FileTreeContentProvider());
207
		tv.setUseHashlookup(true);
207 208
		tv.setLabelProvider(new FileTreeLabelProvider());
208 209
		tv.setInput(new File(currentPath));
209 210

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeContentProvider.java (revision 1610)
33 33

  
34 34
import org.eclipse.jface.viewers.ITreeContentProvider;
35 35
import org.eclipse.jface.viewers.Viewer;
36
import org.txm.core.preferences.TXMPreferences;
37 36
import org.txm.rcp.messages.TXMUIMessages;
38 37
import org.txm.rcp.preferences.RCPPreferences;
39 38

  
40
// TODO: Auto-generated Javadoc
41 39
/**
42 40
 * The Class FileTreeContentProvider.
43 41
 */
......
45 43
	
46 44
	protected Pattern p = null;
47 45
	
46
	public FileTreeContentProvider() {
47
		super();
48
		
49
		String regex = RCPPreferences.getInstance().getString(RCPPreferences.FILES_TO_HIDE);
50
		p = null;
51
		try {
52
			p = Pattern.compile(regex);
53
		} catch(Exception e) { System.out.println(TXMUIMessages.fileExplorerColonIncorrectPattern+regex+TXMUIMessages.eRROR+e);}
54
		
55
	}
56
	
48 57
	/* (non-Javadoc)
49 58
	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
50 59
	 */
51 60
	@Override
52 61
	public Object[] getChildren(Object element) {
53
		String regex = RCPPreferences.getInstance().getString(RCPPreferences.FILES_TO_HIDE);
54 62
		final boolean showHidden = RCPPreferences.getInstance().getBoolean(RCPPreferences.SHOW_HIDDEN_FILES);
63
		
55 64
		//final boolean showFolder = RCPPreferences.getInstance().getBoolean(RCPPreferences.SHOW_FOLDERS);
56
		p = null;
57
		try {
58
		p = Pattern.compile(regex);
59
		} catch(Exception e) { System.out.println(TXMUIMessages.fileExplorerColonIncorrectPattern+regex+TXMUIMessages.eRROR+e);}
60
		
61 65
		Object[] kids = ((File) element).listFiles(new FileFilter() {	
62 66
			@Override
63 67
			public boolean accept(File file) {
......
111 115
	 */
112 116
	@Override
113 117
	public void dispose() {
118
		
114 119
	}
115 120

  
116 121
	/* (non-Javadoc)
......
118 123
	 */
119 124
	@Override
120 125
	public void inputChanged(Viewer viewer, Object old_input, Object new_input) {
126
		
121 127
	}
122 128
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/LazyFileTreeContentProvider.java (revision 1610)
1
package org.txm.rcp.views.fileexplorer;
2

  
3
import java.io.File;
4

  
5
import org.eclipse.jface.viewers.ILazyTreePathContentProvider;
6
import org.eclipse.jface.viewers.TreePath;
7
import org.eclipse.jface.viewers.TreeViewer;
8

  
9
public class LazyFileTreeContentProvider implements ILazyTreePathContentProvider {
10

  
11
	TreeViewer viewer;
12
	
13
	public LazyFileTreeContentProvider(TreeViewer viewer) {
14
		this.viewer = viewer;
15
	}
16
	
17
	@Override
18
	public void updateElement(TreePath parentPath, int index) {
19
		Object o = parentPath.getFirstSegment();
20
		if (o instanceof File) {
21
			
22
		} else {
23
			
24
		}
25
	}
26

  
27
	@Override
28
	public void updateChildCount(TreePath path, int currentChildCount) {
29
		Object o = path.getFirstSegment();
30
		if (o instanceof File) {
31
			File f = (File)o;
32
			File[] files = f.listFiles();
33
			if (files != null) {
34
				viewer.setChildCount(path, files.length);
35
			}
36
		} else {
37
			viewer.setChildCount(path, 0);
38
		}
39
	}
40

  
41
	@Override
42
	public void updateHasChildren(TreePath path) {
43
		Object o = path.getFirstSegment();
44
		if (o instanceof File) {
45
			viewer.setHasChildren(path, (((File)o).isDirectory()));
46
		} else {
47
			viewer.setHasChildren(path, false);
48
		}
49
	}
50

  
51
	@Override
52
	public TreePath[] getParents(Object o) {
53
//		if (o instanceof File) {
54
//			return new TreePath[0];
55
//		} else {
56
//			return new TreePath[0];
57
//		}
58
		return null;
59
	}
60
}
0 61

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 1610)
971 971
zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag = \	Zoom +/-: Mouse wheel OR Shift + Right Mouse + Drag\n
972 972

  
973 973
zoomToSelectionColonCtrlPlusLeftMousePlusdrag = \	Zoom to selection: Ctrl + Left Mouse + Drag\n
974

  
975
theP0CorpusWillBeCreatedFromTheP1Directory=The {0} corpus will be created from the {1} directory.
976

  
977
theP1P0CorpusWillBeReplaced=The {0} ({1}) corpus will be replaced.
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java (revision 1610)
500 500
	public static String wrongInput; 
501 501
	public static String youMustSelectAtLeast2Comparators; 
502 502
	public static String zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag; 
503
	public static String zoomToSelectionColonCtrlPlusLeftMousePlusdrag; 
503
	public static String zoomToSelectionColonCtrlPlusLeftMousePlusdrag;
504 504

  
505
	public static String theP0CorpusWillBeCreatedFromTheP1Directory;
505 506

  
507
	public static String theP1P0CorpusWillBeReplaced; 
508

  
509

  
506 510
	
507 511
	static {
508 512
		// initialize resource bundle
tmp/org.txm.rcp/rcpapplication.product (revision 1610)
289 289
      <feature id="org.eclipse.equinox.p2.user.ui"/>
290 290
      <feature id="org.eclipse.equinox.p2.extras.feature"/>
291 291
      <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
292
      <feature id="org.txm.ca.feature"/>
293
      <feature id="org.txm.chartsengine.jfreechart.feature"/>
294
      <feature id="org.txm.searchengine.cqp.feature"/>
295
      <feature id="org.txm.annotation.feature"/>
296
      <feature id="org.txm.statsengine.r.feature"/>
297
      <feature id="org.txm.edition.feature"/>
298
      <feature id="org.txm.lexicaltable.feature"/>
299
      <feature id="org.txm.internalview.feature"/>
300
      <feature id="org.txm.partition.feature"/>
301
      <feature id="org.txm.concordance.feature"/>
302
      <feature id="org.txm.index.feature"/>
303
      <feature id="org.txm.ahc.feature"/>
304
      <feature id="org.txm.groovy.feature"/>
305
      <feature id="org.txm.specificities.feature"/>
306
      <feature id="org.txm.progression.feature"/>
307
      <feature id="org.txm.treetagger.feature"/>
308
      <feature id="org.txm.properties.feature"/>
309
      <feature id="org.txm.referencer.feature"/>
310
      <feature id="org.txm.chartsengine.r.feature"/>
311
      <feature id="org.txm.cooccurrence.feature"/>
312
      <feature id="org.txm.annotation.kr.feature"/>
292 313
   </features>
293 314

  
294 315
   <configurations>
tmp/org.txm.annotation.kr.rcp/.settings/org.eclipse.core.resources.prefs (revision 1610)
1 1
eclipse.preferences.version=1
2
encoding//src/org/txm/annotation/kr/rcp/messages/messages.properties=UTF-8
2 3
encoding//src/org/txm/annotation/kr/rcp/messages/messages_fr.properties=UTF-8
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java (revision 1610)
159 159

  
160 160
	protected void affectAnnotationValues(final List<Match> matches,  final AnnotationType type, final String svalue, JobHandler job) {
161 161
		value_to_add = null; // reset
162
		if (matches.size() == 0) {
162
		if (matches == null || matches.size() == 0) {
163 163
			System.out.println("No line selected. Aborting."); //$NON-NLS-1$
164 164
			return;
165 165
		}
......
204 204
			return;
205 205
		}
206 206

  
207
		Log.info(NLS.bind(KRAnnotationUIMessages.AffectP0ToSelectionEqualsP1, value_to_add, matches));
207
		Log.info(NLS.bind(KRAnnotationUIMessages.AffectP0ToSelectionEqualsP1, value_to_add, matches.size()));
208 208
		
209 209
		// finally we can 'try' to create the annotations \o/
210 210
		try {
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java (revision 1610)
497 497

  
498 498
	protected void affectAnnotationValues(final List<Match> matches,  final AnnotationType type, final String svalue, JobHandler job) {
499 499
		value_to_add = null; // reset
500
		if (matches.size() == 0) {
500
		if (matches == null || matches.size() == 0) {
501 501
			System.out.println("No line selected. Aborting."); //$NON-NLS-1$
502 502
			return;
503 503
		}
......
563 563
			return;
564 564
		}
565 565

  
566
		Log.info(NLS.bind(KRAnnotationUIMessages.AffectP0ToSelectionEqualsP1, value_to_add, matches));
566
		Log.info(NLS.bind(KRAnnotationUIMessages.AffectP0ToSelectionEqualsP1, value_to_add, matches.size()));
567 567

  
568 568
		// finally we can 'try' to create the annotations \o/
569 569
		try {
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/SaveAnnotations.java (revision 1610)
93 93
					monitor.worked(30);
94 94

  
95 95
					if (rez) {
96
						System.out.println("Annotations are saved in XML-TXM files. Updating corpus indexes and editions");
96
						Log.fine("Annotations are saved in XML-TXM files. Updating corpus indexes and editions");
97 97
					} else {
98
						System.out.println("Error while saving annotations (see logs above).");
98
						Log.severe("** Error while saving annotations (see logs above).");
99 99
					}
100 100

  
101 101
				} catch(Exception e) {
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/RecodeCorpus.java (revision 1610)
17 17
import org.eclipse.core.runtime.Status;
18 18
import org.eclipse.jface.viewers.ISelection;
19 19
import org.eclipse.jface.viewers.IStructuredSelection;
20
import org.eclipse.osgi.util.NLS;
20 21
import org.eclipse.swt.widgets.Display;
21 22
import org.eclipse.ui.handlers.HandlerUtil;
22 23
import org.kohsuke.args4j.Option;
23 24
import org.txm.Toolbox;
24 25
import org.txm.annotation.kr.core.conversion.CorpusRuledConvertion;
26
import org.txm.annotation.kr.rcp.messages.KRAnnotationUIMessages;
25 27
import org.txm.core.preferences.TBXPreferences;
26 28
import org.txm.objects.Project;
27 29
import org.txm.rcp.commands.CloseEditorsUsing;
......
119 121
//		monitor.setTaskName("Updating corpus");
120 122
//		File scriptDir = new File(txmhome, "scripts/groovy/user/org/txm/scripts/importer/xtz");
121 123
//		File script = new File(scriptDir, "xtzLoader.groovy");
122
		System.out.println("Updating corpus "+corpus+" using "+project);
124
		System.out.println(NLS.bind(KRAnnotationUIMessages.updatingTheP0Corpus, corpus));
123 125
		JobHandler ret = ExecuteImportScript.executeScript(project);
124 126
		Display.getDefault().syncExec(new Runnable() {
125 127
			@Override
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages.properties (revision 1610)
3 3
aboutAnnotations=About annotations
4 4
addANewCategory=Add a new category
5 5
affect=Affect
6
AffectP0ToSelectionEqualsP1=Affect {0} to selection {1}
6
AffectP0ToSelectionEqualsP1=Affect {0} to selection ({1}).
7 7
all=All
8 8
allLines=all lines
9 9
annotatingConcordanceSelection=Annotating concordance selection…
......
27 27
lookingForTypedValueWithIdEqualsP0=Looking for TypedValue with id\={0}
28 28
motsPropritsInfDfaut=Words (property) <- defaut
29 29
newCategory=New category
30
newValueP0ForCategoryP1=New value ‘'{0}' for category {1}  
30
newValueP0ForCategoryP1=New value ''{0}'' for category ''{1}''.
31 31
nomDeLaPropritPatternEqualsazaz09Plus=Property name pattern\: [a-z][-a-z0-9]+
32 32
nouvelleProprit=New property
33 33
noValueFoundWithTheP0Id=No value found with the {0} identifier.
......
48 48
valueEquals=value\=
49 49
withTheCategory=with the category
50 50
youAreAboutToAnnotateP0ElementsContinue=You are about to annotate {0} elements. Continue ?
51
updatingTheP0Corpus=Updating the {0} corpus...
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages_fr.properties (revision 1610)
3 3
aboutAnnotations=À propos des annotations
4 4
addANewCategory=Ajouter une nouvelle catégorie
5 5
affect=Affecter
6
AffectP0ToSelectionEqualsP1=Affecter {0} à la sélection {1}
6
AffectP0ToSelectionEqualsP1=Affecter {0} à la sélection ({1}).
7 7
all=Tous
8 8
allLines=toutes les lignes
9 9
annotatingConcordanceSelection=Annotation de la sélection de la concordance...
......
48 48
valueEquals=value\=
49 49
withTheCategory=avec la catégorie
50 50
youAreAboutToAnnotateP0ElementsContinue=Vous êtes sur le point d''annoter {0} éléments. Continuer ?
51
updatingTheP0Corpus=Mise à jour du corpus {0}...
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/KRAnnotationUIMessages.java (revision 1610)
71 71
	public static String all; 
72 72
	public static String nouvelleProprit; 
73 73
	public static String nomDeLaPropritPatternEqualsazaz09Plus; 
74
	public static String property; 
74
	public static String property;
75

  
76
	public static String updatingTheP0Corpus; 
75 77
}
tmp/org.txm.annotation.kr.core/.settings/org.eclipse.core.resources.prefs (revision 1610)
1
eclipse.preferences.version=1
2
encoding//src/org/txm/annotation/kr/core/messages/messages.properties=UTF-8
3
encoding//src/org/txm/annotation/kr/core/messages/messages_fr.properties=UTF-8
0 4

  
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/messages/KRAnnotationCoreMessages.java (revision 1610)
1
package org.txm.annotation.kr.core.messages;
2

  
3
import org.eclipse.osgi.util.NLS;
4
import org.txm.utils.messages.Utf8NLS;
5

  
6

  
7
/**
8
 * KR annotation UI messages.
9
 * 
10
 * @author mdecorde
11
 * @author sjacquot
12
 *
13
 */
14
public class KRAnnotationCoreMessages extends NLS {
15

  
16
	private static final String BUNDLE_NAME = "org.txm.annotation.kr.rcp.messages.messages"; //$NON-NLS-1$
17
	
18
	public static String savingP0Annotations;
19

  
20
	public static Throwable annotationSuccesfullyWritten;
21

  
22
	public static String savingAnnotations;
23

  
24
	public static String annotationSuccesfullyWrittenIntheP0File;
25
	
26
	static {
27
		// initialize resource bundle
28
		Utf8NLS.initializeMessages(BUNDLE_NAME, KRAnnotationCoreMessages.class);
29
	}
30

  
31
	private KRAnnotationCoreMessages() {
32
	}
33
	
34
	
35
}
0 36

  
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/messages/messages_fr.properties (revision 1610)
1
savingP0Annotations=Enregistrement de {0} annotations...
2
annotationSuccessfullyWritten=Annotations enregistrées.
3
savingAnnotations=Enregistrement des annotations
4
annotationSuccesfullyWrittenIntheP0File=Annotations enregistrées dans le fichier {0}.
0 5

  
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/messages/messages.properties (revision 1610)
1
savingP0Annotations=Saving {0} annotations...
2
annotationSuccessfullyWritten=Annotations successfully written.
3
savingAnnotations=Saving annotations
4
annotationSuccesfullyWrittenIntheP0File=Annotations successfully written in the {0} file.
0 5

  
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/LocalKnowledgeRepository.java (revision 1610)
7 7

  
8 8
import org.txm.Toolbox;
9 9
import org.txm.annotation.kr.core.DatabasePersistenceManager;
10
import org.txm.core.preferences.TBXPreferences;
11 10
import org.txm.sql.SQLConnection;
11
import org.txm.utils.logger.Log;
12 12

  
13 13
public class LocalKnowledgeRepository extends KnowledgeRepository {
14 14

  
......
28 28
		String path = accessProperties.get(SQLConnection.SQL_ADDRESS);
29 29
		if (path == null || path.trim().length() == 0) { // no address, forge one 
30 30
			path = Toolbox.getTxmHomePath()+"/repositories/"+getName();
31
			System.out.println("No address given to build values. No values created");
31
			Log.finest("No address given to build values. No values created");
32 32
			return true;
33 33
		}
34 34
		currentDirectory = new File(path);
35 35

  
36 36
		if (!currentDirectory.exists()) {
37
			System.out.println("Values address given does not exists: "+currentDirectory);
37
			Log.finest("Values address given does not exists: "+currentDirectory);
38 38
			return false;
39 39
		}
40 40
		try {
......
58 58
						}
59 59

  
60 60
						if (values.contains(val.getPK().getId())) {
61
							System.out.println("WARNING: duplicate '"+val.getId()+"' value ID in '"+type+"' type of '"+name+"' knowledge repository. Ignoring the value.");
61
							Log.warning("WARNING: duplicate '"+val.getId()+"' value ID in '"+type+"' type of '"+name+"' knowledge repository. Ignoring the value.");
62 62
						} else {
63 63
							values.add(val.getPK().getId());
64 64
							jpaem.persist(val);	
......
76 76
			}
77 77
			return true;
78 78
		} catch(Exception e) {
79
			System.out.println("Error while loading types from file: "+currentDirectory);
79
			Log.severe("Error while loading types from file: "+currentDirectory);
80 80
			e.printStackTrace();
81 81
			return false;
82 82
		}
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/KnowledgeRepository.java (revision 1610)
71 71
	 * @return
72 72
	 */
73 73
	public EntityManager initializeEntityManager(){
74
		this.dbPath = Toolbox.getTxmHomePath()+"/repositories/"+name;
74
		this.dbPath = new File(Toolbox.getTxmHomePath(), "repositories/"+name).getAbsolutePath();
75 75
		//System.out.println("KnowledgeRepository.initializeEntityManager [DB @ "+dbPath+"]");
76 76
		EntityManagerFactory emf;
77 77
		HashMap<String, Object> properties = new HashMap<String, Object>();
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationManager.java (revision 1610)
7 7
import java.util.List;
8 8

  
9 9
import org.eclipse.core.runtime.IProgressMonitor;
10
import org.eclipse.osgi.util.NLS;
11
import org.txm.annotation.kr.core.messages.KRAnnotationCoreMessages;
10 12
import org.txm.annotation.kr.core.repository.AnnotationEffect;
11 13
import org.txm.annotation.kr.core.repository.AnnotationType;
12 14
import org.txm.annotation.kr.core.repository.TypedValue;
......
53 55
		}
54 56
		
55 57
		if (monitor != null) {
56
			monitor.beginTask("Saving annotations", annots.size());
58
			monitor.beginTask(KRAnnotationCoreMessages.savingAnnotations, annots.size());
57 59
			monitor.setTaskName("writing annotations in XML-TXM files");
58 60
		}
59 61

  
60 62
		AnnotationWriter writer = new AnnotationWriter(corpus);
61 63
		if (writer.writeAnnotations(annots, monitor)) {
62
			Log.info("Annotations succesfully written. Deleting temporary annotations...");
64
			Log.info(KRAnnotationCoreMessages.annotationSuccesfullyWritten);
63 65
			tempManager.deleteAnnotations();
64 66
			dirty = false;
65 67
			return true;
......
71 73
		AnnotationWriter writer = new AnnotationWriter(corpus);
72 74
		
73 75
		if (writer.writeAnnotationsInStandoff(resultZipFile)) {
74
			Log.info("Annotations succesfully written in "+resultZipFile);
76
			Log.info(NLS.bind(KRAnnotationCoreMessages.annotationSuccesfullyWrittenIntheP0File, resultZipFile));
75 77
			return true;
76 78
		}
77 79
		return false;
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationWriter.java (revision 1610)
15 15
import org.eclipse.osgi.util.NLS;
16 16
import org.osgi.service.prefs.BackingStoreException;
17 17
import org.txm.Toolbox;
18
import org.txm.annotation.kr.core.messages.KRAnnotationCoreMessages;
18 19
import org.txm.annotation.kr.core.repository.AnnotationEffect;
19 20
import org.txm.annotation.kr.core.repository.AnnotationType;
20 21
import org.txm.annotation.kr.core.repository.KnowledgeRepository;
......
140 141
	 */
141 142
	public boolean writeAnnotations(List<Annotation> allCorpusAnnotations, IProgressMonitor monitor) throws IOException, CqiServerError, CqiClientException, InvalidCqpIdException, XMLStreamException, BackingStoreException{
142 143
		//MainCorpus corpus = CorpusManager.getCorpusManager().getCorpus(c.getName());
143
		Log.info(NLS.bind("Saving {0} annotations...", allCorpusAnnotations.size()));
144
		Log.info(NLS.bind(KRAnnotationCoreMessages.savingP0Annotations, allCorpusAnnotations.size()));
144 145

  
145 146
		int[] end_limits = corpus.getTextEndLimits();
146 147
		int[] start_limits = corpus.getTextStartLimits();
......
240 241
	
241 242
	protected boolean writeAnnotationsInFile(File xmlFile, int text_start_position, 
242 243
			ArrayList<Annotation> segmentAnnotations, ArrayList<Annotation> tokenAnnotations, File tmpXMLTXMDirectory, File previousXMLTXMDirectory) throws CqiClientException, IOException, CqiServerError, InvalidCqpIdException, XMLStreamException{
243
		System.out.println("Writing annotations for text "+xmlFile+" segment annotations="+segmentAnnotations.size()+" token annotations="+tokenAnnotations.size());
244
		System.out.println(segmentAnnotations);
245
		System.out.println(tokenAnnotations);
244
		Log.info("Writing annotations for text "+xmlFile+" segment annotations="+segmentAnnotations.size()+" token annotations="+tokenAnnotations.size());
245
		//System.out.println(segmentAnnotations);
246
		//System.out.println(tokenAnnotations);
246 247

  
247 248
		boolean show_debug = Log.getLevel().intValue() < Level.INFO.intValue();
248 249
		AnnotationInjector annotationInjector = new AnnotationInjector(xmlFile, segmentAnnotations, tokenAnnotations, text_start_position, show_debug);
tmp/org.txm.treetagger.core/src/org/txm/treetagger/core/TreeTaggerEngine.java (revision 1610)
25 25
		
26 26
		ttBinaryDirectory = new File(TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.INSTALL_PATH)+"/bin/");
27 27
		if (!ttBinaryDirectory.exists()) {
28
			System.out.println(NLS.bind("** Error: path to TreeTagger software is wrong: {0}.", ttBinaryDirectory));
28
			System.out.println(NLS.bind("** Error: TreeTagger software not found in the {0} directory.", ttBinaryDirectory));
29 29
			return false;
30 30
		}
31 31
		
32 32
		ttModelsDirectory = new File(TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.MODELS_PATH));
33 33
		if (!ttModelsDirectory.exists()) {
34
			System.out.println(NLS.bind("** Error: path to TreeTagger models directory is wrong: {0}.", ttModelsDirectory));
34
			System.out.println(NLS.bind("** Error: TreeTagger models not found in the {0} directory.", ttModelsDirectory));
35 35
			return false;
36 36
		}
37 37
		
tmp/org.txm.rcp.feature/feature.properties (revision 1610)
1
description = \
2
TXM 0.8.0 - main commands
0 3

  
tmp/org.txm.rcp.feature/feature.xml (revision 1610)
6 6
      provider-name="Textometrie.org"
7 7
      plugin="org.txm.rcp">
8 8

  
9
   <description url="http://www.example.com/description">
10
      &lt;h3&gt;TXM 0.8.0 update&lt;/h3&gt;
9
   <description url="http://textometrie.ens-lyon.fr/files/software/TXM/0.8.0">
10
      %description
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
......
164 164

  
165 165
   <includes
166 166
         id="org.txm.index.feature"
167
         version="0.0.0"/>
167
         version="0.0.0"
168
         optional="true"/>
168 169

  
169 170
   <includes
170 171
         id="org.txm.concordance.feature"
171
         version="0.0.0"/>
172
         version="0.0.0"
173
         optional="true"/>
172 174

  
173 175
   <includes
174 176
         id="org.txm.cooccurrence.feature"
175
         version="0.0.0"/>
177
         version="0.0.0"
178
         optional="true"/>
176 179

  
177 180
   <includes
178 181
         id="org.txm.ahc.feature"
179
         version="0.0.0"/>
182
         version="0.0.0"
183
         optional="true"/>
180 184

  
181 185
   <requires>
182 186
      <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>
......
219 223
      <import plugin="org.eclipse.ui.themes" version="1.2.1" match="greaterOrEqual"/>
220 224
      <import plugin="org.txm.annotation.core" version="1.0.0" match="greaterOrEqual"/>
221 225
      <import plugin="org.eclipse.ui.views" version="3.9.0" match="greaterOrEqual"/>
226
      <import plugin="org.txm.groovy.core"/>
227
      <import plugin="org.txm.treetagger.core"/>
222 228
      <import plugin="org.eclipse.osgi.util" version="3.3.0" match="greaterOrEqual"/>
223 229
      <import plugin="org.eclipse.core.net" version="1.2.200" match="greaterOrEqual"/>
224 230
      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
......
252 258
      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
253 259
      <import plugin="org.txm.chartsengine.rcp" version="1.0.0" match="greaterOrEqual"/>
254 260
      <import plugin="org.txm.chartsengine.core" version="1.0.0" match="greaterOrEqual"/>
255
      <import plugin="org.txm.groovy.core"/>
256
      <import plugin="org.txm.treetagger.core"/>
257
      <import plugin="org.txm.treetagger.rcp"/>
258 261
      <import plugin="javax.persistence" version="2.1.0" match="greaterOrEqual"/>
259 262
      <import plugin="org.eclipse.persistence.jpa" version="2.6.0" match="greaterOrEqual"/>
260 263
      <import plugin="org.eclipse.persistence.jpa.jpql" version="2.6.0" match="greaterOrEqual"/>
261 264
      <import plugin="org.txm.annotation.kr.core" version="1.0.0" match="greaterOrEqual"/>
262 265
      <import plugin="org.txm.annotation.rcp" version="1.0.0" match="greaterOrEqual"/>
263 266
      <import plugin="org.txm.concordance.rcp" version="1.0.0" match="greaterOrEqual"/>
267
      <import plugin="org.txm.libs.hsqldb" version="1.0.0" match="greaterOrEqual"/>
268
      <import plugin="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.201" match="greaterOrEqual"/>
269
      <import plugin="org.eclipse.e4.ui.workbench.renderers.swt"/>
270
      <import plugin="org.txm.edition.rcp" version="1.0.0" match="greaterOrEqual"/>
264 271
   </requires>
265 272

  
266 273
   <plugin
tmp/org.txm.rcp.feature/feature_fr.properties (revision 1610)
1
description = \
2
TXM 0.8.0 - commandes principales
0 3

  
tmp/org.txm.core/src/java/org/txm/importer/ApplyXsl2.java (revision 1610)
71 71

  
72 72
import net.sf.saxon.TransformerFactoryImpl;
73 73

  
74
import org.eclipse.osgi.util.NLS;
74 75
import org.txm.stat.utils.ConsoleProgressBar;
75 76
import org.txm.utils.Diff;
76 77
import org.txm.utils.io.FileCopy;
......
144 145
		System.setProperty("javax.xml.transform.TransformerFactory", "net.sf.saxon.TransformerFactoryImpl");
145 146

  
146 147
		tFactory = new net.sf.saxon.TransformerFactoryImpl();
147
		Log.info("new tFactory: "+tFactory);
148
		//Log.info("new tFactory: "+tFactory);
148 149
		tFactory.getConfiguration().registerExtensionFunction(new SaxonNodeSet());
149
		Log.info("ApplyXsl2 from file: "+xsltfile);
150
		Log.info(NLS.bind("ApplyXsl2 with the {0} stylesheet.", xsltfile));
150 151
		reload();
151
		Log.info("new transformer: "+transformer);
152
		//Log.info("new transformer: "+transformer);
152 153
	}
153 154

  
154 155
	/**
tmp/org.txm.core/src/java/org/txm/objects/Project.java (revision 1610)
297 297

  
298 298
			Log.finest("RUNNING IMPORT MODULE WITH NAME = " + getImportModuleName());
299 299

  
300
			// This step could be done only if the compiler step if done and only if it modifying/deleteing the corpus builds
300
			// This step could be done only if the compiler step if done and only if it modifying/deleting the corpus builds
301 301
			for (CorpusBuild corpus : getCorpusBuilds()) {
302 302
				if (corpus != null) {
303 303
					corpus.deleteChildren(null); // remove all Corpus results
tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java (revision 1610)
121 121
			}
122 122

  
123 123
			ExecTimer.start();
124
			Log.info(NLS.bind(GroovyMessages.startingTheP0GroovyImportScript, mainScript.getAbsolutePath())); //$NON-NLS-1$
124
			Log.info(NLS.bind(GroovyMessages.startingTheP0GroovyImportScript, mainScript.getName())); //$NON-NLS-1$
125 125
			gse.run(mainScript.toURI().toURL().toString(), binding); // run the groovy import script
126 126
			Log.fine("\nEnd of Groovy import script: " + ExecTimer.stop()); //$NON-NLS-1$
127 127
			monitor.worked(90);
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xtz/XTZImporter.groovy (revision 1610)
110 110
				return;
111 111
			}
112 112
			metadata = new Metadatas(copy,
113
			Toolbox.getPreference(TBXPreferences.METADATA_ENCODING),
114
			Toolbox.getPreference(TBXPreferences.METADATA_COLSEPARATOR),
115
			Toolbox.getPreference(TBXPreferences.METADATA_TXTSEPARATOR), 1)
113
					Toolbox.getPreference(TBXPreferences.METADATA_ENCODING),
114
					Toolbox.getPreference(TBXPreferences.METADATA_COLSEPARATOR),
115
					Toolbox.getPreference(TBXPreferences.METADATA_TXTSEPARATOR), 1)
116 116
		}
117 117

  
118 118
		String cleanDirectories = project.getCleanAfterBuild();
119
		
119

  
120 120
		if (!doFixSurrogates()) return;
121 121
		if (!doSplitMergeXSLStep()) return;
122 122
		if (!doFrontXSLStep()) return;
......
246 246
		//filesToProcess = inputDirectory.listFiles();
247 247

  
248 248
		File frontXSLdirectory = new File(module.getSourceDirectory(), "xsl/2-front")
249
		println "-- Front XSL Step with $frontXSLdirectory"
249
		println "-- Front XSL Step with the $frontXSLdirectory directory."
250 250
		def xslFiles = frontXSLdirectory.listFiles()
251 251
		if (frontXSLdirectory.exists() && xslFiles != null && xslFiles.size() > 0) {
252 252

  
......
271 271

  
272 272
	public boolean doCheckXMLFileStep() {
273 273
		filesToProcess = []
274
		println "-- Check XML files for well-formedness."
274
		println "-- Checking XML files for well-formedness."
275 275
		def files = inputDirectory.listFiles()
276 276

  
277 277
		if (files == null || files.size() == 0) {
......
308 308

  
309 309
	public boolean doTokenizeStep() {
310 310

  
311
		println "-- Tokenizing "+filesToProcess.size()+" files"
312 311
		new File(module.getBinaryDirectory(),"tokenized").mkdir()
313 312

  
314 313
		String outSideTextTagsRegex = "";
......
316 315
		String noteRegex = "";
317 316
		// get the element names to ignore
318 317

  
319
			String e1 = module.getProject().getTextualPlan("OutSideTextTags")
320
			def split  = e1.split(",")
321
			for (String s : split) {
322
				outSideTextTagsRegex += "|"+s.trim()
323
			}
324
			if (outSideTextTagsRegex.trim().length() > 0) {
325
				outSideTextTagsRegex = outSideTextTagsRegex.substring(1) // remove the first "|"
326
			}
318
		String e1 = module.getProject().getTextualPlan("OutSideTextTags")
319
		def split  = e1.split(",")
320
		for (String s : split) {
321
			outSideTextTagsRegex += "|"+s.trim()
322
		}
323
		if (outSideTextTagsRegex.trim().length() > 0) {
324
			outSideTextTagsRegex = outSideTextTagsRegex.substring(1) // remove the first "|"
325
		}
327 326

  
328
			String e2 = module.getProject().getTextualPlan("OutSideTextTagsAndKeepContent")
329
			def split2  = e2.split(",")
330
			for (String s : split2) {
331
				outSideTextTagsAndKeepContentRegex += "|"+s.trim()
332
			}
333
			if (outSideTextTagsAndKeepContentRegex.trim().length() > 0) {
334
				outSideTextTagsAndKeepContentRegex = outSideTextTagsAndKeepContentRegex.substring(1) // remove the first "|"
335
			}
327
		String e2 = module.getProject().getTextualPlan("OutSideTextTagsAndKeepContent")
328
		def split2  = e2.split(",")
329
		for (String s : split2) {
330
			outSideTextTagsAndKeepContentRegex += "|"+s.trim()
331
		}
332
		if (outSideTextTagsAndKeepContentRegex.trim().length() > 0) {
333
			outSideTextTagsAndKeepContentRegex = outSideTextTagsAndKeepContentRegex.substring(1) // remove the first "|"
334
		}
336 335

  
337
			String e3 = module.getProject().getTextualPlan("Note")
338
			def split3  = e3.split(",")
339
			for (String s : split3) {
340
				noteRegex += "|"+s.trim()
341
			}
342
			if (noteRegex.trim().length() > 0) {
343
				noteRegex = noteRegex.substring(1) // remove the first "|"
344
			}
336
		String e3 = module.getProject().getTextualPlan("Note")
337
		def split3  = e3.split(",")
338
		for (String s : split3) {
339
			noteRegex += "|"+s.trim()
340
		}
341
		if (noteRegex.trim().length() > 0) {
342
			noteRegex = noteRegex.substring(1) // remove the first "|"
343
		}
345 344

  
346 345
		//if (wordTag != "w") {
347 346
		if (doTokenizeStep) {
......
353 352
			}
354 353
			return true;
355 354
		} else {
355
			println "-- Tokenizing "+filesToProcess.size()+" files"
356 356
			ConsoleProgressBar cpb = new ConsoleProgressBar(filesToProcess.size())
357 357
			for (File f : filesToProcess) {
358 358
				cpb.tick()
tmp/org.txm.ahc.feature/feature.xml (revision 1610)
5 5
      version="1.0.0.qualifier"
6 6
      provider-name="Textometrie.org"
7 7
      license-feature="org.txm.rcp.feature"
8
      license-feature-version="1.0.0.qualifier">
8
      license-feature-version="0.8.0.qualifier">
9 9

  
10 10
   <description url="http://www.example.com/description">
11
      [Enter Feature Description here.]
11
      AHC command plugins
12 12
   </description>
13 13

  
14 14
   <copyright url="http://www.example.com/copyright">
tmp/TXMReleasePlugins.site/site.xml (revision 1610)
9 9
   <feature url="features/org.txm.wordcloud.feature_1.0.0.1576.jar" id="org.txm.wordcloud.feature" version="1.0.0.1576">
10 10
      <category name="Commands"/>
11 11
   </feature>
12
   <feature url="features/org.txm.rcp.feature_0.8.0.1576.jar" id="org.txm.rcp.feature" version="0.8.0.1576">
13
      <category name="org.txm.platform"/>
14
   </feature>
15 12
   <feature url="features/org.txm.treetagger.binaries.feature_1.0.0.1576.jar" id="org.txm.treetagger.binaries.feature" version="1.0.0.1576">
16 13
      <category name="Annotation"/>
17 14
   </feature>
......
25 22
      <category name="Annotation"/>
26 23
   </feature>
27 24
   <category-def name="Commands" label="Commands"/>
28
   <category-def name="org.txm.platform" label="TXM Platform"/>
29 25
   <category-def name="Annotation" label="Annotation"/>
30 26
</site>

Formats disponibles : Unified diff