Révision 3823

TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/InitializeKnowledgeRepository.java (revision 3823)
15 15
import org.txm.annotation.kr.core.KRAnnotationEngine;
16 16
import org.txm.annotation.kr.core.repository.KnowledgeRepository;
17 17
import org.txm.annotation.kr.core.repository.KnowledgeRepositoryManager;
18
import org.txm.annotation.kr.rcp.messages.Messages;
18 19
import org.txm.rcp.swt.dialog.UsernamePasswordDialog;
19 20
import org.txm.searchengine.cqp.corpus.MainCorpus;
20 21
import org.txm.utils.logger.Log;
......
53 54
				kr = KRAnnotationEngine.getKnowledgeRepository(corpus, kr_name);
54 55
				
55 56
				if (kr == null) {
56
					Log.warning(NLS.bind("Warning ''{0}'' KR is null. Please check KR configuration.", kr_name));
57
					Log.warning(NLS.bind(Messages.WarningP0KRIsNullPleaseCheckKRConfiguration, kr_name));
57 58
					continue;
58 59
				}
59 60
				//System.out.println("IS CREDENTIAL NEEDED: "+kr_name+" "+corpus);
60 61
				boolean[] must = KnowledgeRepositoryManager.mustLoginToKnowledgeRepository(kr_name, corpus);
61 62
				
62 63
				if (must[0] || must[1]) {
63
					Log.info(NLS.bind("Asking credentials for {0} KR login.", kr_name));
64
					Log.info(NLS.bind(Messages.AskingCredentialForP0KRLogin, kr_name));
64 65
					UsernamePasswordDialog dialog = new UsernamePasswordDialog(Display.getCurrent().getActiveShell(), must, kr_name);
65 66
					
66 67
					if (dialog.open() == UsernamePasswordDialog.OK) {
67
						Log.info("Temporary save login+password");
68
						Log.info("Temporary save login+password"); //$NON-NLS-1$
68 69
						System.setProperty(KnowledgeRepository.LOGIN_KEY+kr_name, dialog.getUser());
69 70
						System.setProperty(KnowledgeRepository.PASSWORD_KEY+kr_name, dialog.getPassword());
70 71
					} else {
71
						Log.info(NLS.bind("Cancelling login for {0} KR.", kr_name));
72
						Log.info(NLS.bind(Messages.CancelingLoginForP0KR, kr_name));
72 73
						continue; // ignoring
73 74
					}
74 75
				}
75 76
				
76 77
				if (!kr.checkConnection()) {
77
					Log.warning(NLS.bind("Error during connection to the ''{0}'' KR. Please check login, password and Internet connection.", kr_name));
78
					Log.warning(NLS.bind(Messages.ErrorDuringConnectionToTheP0KRPleaseCheckLogin, kr_name));
78 79
				} else {
79 80
					ret.add(kr);
80 81
				}
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/ImportTable.java (revision 3823)
45 45
import org.txm.Toolbox;
46 46
import org.txm.annotation.kr.core.AnnotationManager;
47 47
import org.txm.annotation.kr.core.KRAnnotationEngine;
48
import org.txm.annotation.kr.rcp.messages.Messages;
48 49
import org.txm.rcp.StatusLine;
49 50
import org.txm.rcp.messages.TXMUIMessages;
50 51
import org.txm.rcp.swt.dialog.LastOpened;
......
74 75
		
75 76
		Object s = selection.getFirstElement();
76 77
		if (!(s instanceof MainCorpus)) {
77
			Log.warning(NLS.bind("Selection is not a Corpus: {0}. Aborting.", s));
78
			Log.warning(NLS.bind(Messages.SelectionIsNotACorpusP0Aborting, s));
78 79
			return null;
79 80
		}
80 81
		
......
84 85
		MainCorpus corpus = (MainCorpus) s;
85 86
		String path = Toolbox.getTxmHomePath();
86 87
		dialog.setFilterPath(path); //To set a specific path
87
		dialog.setFileName(corpus.getID()+"_annotations.csv");
88
		dialog.setFilterExtensions(new String[]{"*.csv", "*.tsv"});
88
		dialog.setFileName(corpus.getID()+"_annotations.csv"); //$NON-NLS-1$
89
		dialog.setFilterExtensions(new String[]{"*.csv", "*.tsv"}); //$NON-NLS-1$ //$NON-NLS-2$
89 90
		if (dialog.open() != null) {
90
			StatusLine.setMessage(TXMUIMessages.exportingAnnotations);
91
			StatusLine.setMessage(Messages.exportingAnnotations);
91 92
			String filepath = dialog.getFilterPath();
92 93
			String filename = dialog.getFileName();
93 94
			
......
114 115
			protected IStatus run(IProgressMonitor monitor) {
115 116
				this.runInit(monitor);
116 117
				try {
117
					monitor.beginTask("Importing annotations as standoff", 100);
118
					monitor.beginTask(Messages.ImportingAnnotationsAsStandOff, 100);
118 119
					
119
					monitor.setTaskName("Reading annotations in the table file: "+annotationsFile);
120
					monitor.setTaskName(Messages.ReadingAnnotationsInTheTableFileP0+annotationsFile);
120 121
					/*if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Before saving annotations...", "All editors using this corpus are going to be closed. Continue ?")) {
121 122
						return false;
122 123
					}*/
......
125 126
					///chaque annotation est récupérée et selon l'annotateur, écrite dans un fichier spécifique à celui-ci
126 127
					
127 128
					if (!am.importAnnotationsFromTable(annotationsFile)) {
128
						Log.warning("Error while importing annotations (see logs above).");
129
						Log.warning(Messages.ErrorWhileImportingAnnotations);
129 130
						return Status.CANCEL_STATUS;
130 131
					}
131 132
					monitor.worked(30);
132 133
					
133
					corpus.getProject().appendToHistory("CQP Annotations imported from "+annotationsFile);
134
					Log.info("Done.");
134
					corpus.getProject().appendToHistory(Messages.CQPAnnotationsImportedFromP0+annotationsFile);
135
					Log.info(Messages.Done);
135 136
					
136 137
				} catch(Exception e) {
137
					Log.warning(NLS.bind("Error while importing annotations: {0}.", e));
138
					Log.warning(NLS.bind(Messages.ErrorWhileImportingAnnotationsP0, e));
138 139
					Log.printStackTrace(e);
139 140
					return Status.CANCEL_STATUS;
140 141
				}
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/ExportStandoff.java (revision 3823)
45 45
import org.txm.Toolbox;
46 46
import org.txm.annotation.kr.core.AnnotationManager;
47 47
import org.txm.annotation.kr.core.KRAnnotationEngine;
48
import org.txm.annotation.kr.rcp.messages.Messages;
48 49
import org.txm.core.preferences.TBXPreferences;
49 50
import org.txm.rcp.StatusLine;
50 51
import org.txm.rcp.messages.TXMUIMessages;
......
74 75

  
75 76
		Object s = selection.getFirstElement();
76 77
		if (!(s instanceof MainCorpus)) {
77
			Log.warning(NLS.bind("Selection is not a Corpus: {0}. Aborting.", s));
78
			Log.warning(NLS.bind(Messages.SelectionIsNotACorpusAborting, s));
78 79
			return null;
79 80
		}
80 81

  
......
84 85
		MainCorpus corpus = (MainCorpus) s;
85 86
		String path = Toolbox.getTxmHomePath();
86 87
		dialog.setFilterPath(path); //To set a specific path
87
		dialog.setFileName(corpus.getID()+"_annotations.zip");
88
		dialog.setFilterExtensions(new String[]{"*.zip"});
88
		dialog.setFileName(corpus.getID()+"_annotations.zip"); //$NON-NLS-1$
89
		dialog.setFilterExtensions(new String[]{"*.zip"}); //$NON-NLS-1$
89 90
		if (dialog.open() != null) {
90
			StatusLine.setMessage(TXMUIMessages.exportingAnnotations);
91
			StatusLine.setMessage(Messages.exportingAnnotations);
91 92
			String filepath = dialog.getFilterPath();
92 93
			String filename = dialog.getFileName();
93 94

  
......
123 124
			protected IStatus run(IProgressMonitor monitor) {
124 125
				this.runInit(monitor);
125 126
				try {
126
					monitor.beginTask("Exporting annotations as standoff", 100);
127
					monitor.beginTask(Messages.ExportingAnnotationsAsStandoff, 100);
127 128
					
128
					monitor.setTaskName("Writing annotations in XML-TXM stand-off files");
129
					monitor.setTaskName(Messages.WritingAnnotationsInXMLTXMStandOffFiles);
129 130
					/*if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Before saving annotations...", "All editors using this corpus are going to be closed. Continue ?")) {
130 131
						return false;
131 132
					}*/
......
134 135
					///chaque annotation est récupérée et selon l'annotateur, écrite dans un fichier spécifique à celui-ci
135 136

  
136 137
					if (!am.exportAnnotationsToSyMoGIH(resultZipFile)) {
137
						Log.warning("Error while saving stand-off annotations (see logs above).");
138
						Log.warning(Messages.ErrorWhileSavingStandOffAnnotations);
138 139
						return Status.CANCEL_STATUS;
139 140
					}
140 141
					monitor.worked(30);
141 142
					
142
					Log.info("Done.");
143
					Log.info(Messages.Done);
143 144

  
144 145
				} catch(Exception e) {
145
					Log.warning(NLS.bind("Error while saving annotations: {0}.", e));
146
					Log.warning(NLS.bind(Messages.ErrorWhileSavingAnnotationsP0, e));
146 147
					Log.printStackTrace(e);
147 148
					return Status.CANCEL_STATUS;
148 149
				}
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/krview/Delete.java (revision 3823)
40 40
import org.txm.annotation.kr.core.repository.LocalKnowledgeRepository;
41 41
import org.txm.annotation.kr.core.repository.SQLKnowledgeRepository;
42 42
import org.txm.annotation.kr.core.repository.TypedValue;
43
import org.txm.annotation.kr.rcp.messages.Messages;
43 44
import org.txm.annotation.kr.rcp.views.knowledgerepositories.KRView;
44 45
import org.txm.utils.logger.Log;
45 46

  
......
74 75

  
75 76
		} else if (selectedItem instanceof LocalKnowledgeRepository) {
76 77
			LocalKnowledgeRepository kr = ((LocalKnowledgeRepository)selectedItem);
77
			Log.info("Delete a LocalKnowledgeRepository...");
78
			Log.info(Messages.DeleteALocalKR);
78 79
			
79 80
			//TODO: confirm message dialog to generate
80 81
			KnowledgeRepositoryManager.deleteKnowledgeRepository(kr);
......
86 87
			
87 88
			if (kr instanceof LocalKnowledgeRepository) {
88 89
				final LocalKnowledgeRepository lkr = ((LocalKnowledgeRepository)kr);
89
				Log.info("Delete an AnnotationType...");
90
				Log.info(Messages.DeleteAnAnnotationType);
90 91
				
91 92
				/*JobHandler job = new JobHandler("Deleting all annotations for type : "+t) {
92 93
					@Override
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/krview/Informations.java (revision 3823)
64 64
	{
65 65
		Object selectedItem = selection.getFirstElement();
66 66
		
67
		String url = "";
67
		String url = ""; //$NON-NLS-1$
68 68
		if (selectedItem instanceof SQLKnowledgeRepository) {
69 69
			url = ((SQLKnowledgeRepository)selectedItem).getURL();
70 70
		} else if (selectedItem instanceof LocalKnowledgeRepository) {
......
73 73
		} else if (selectedItem instanceof AnnotationType) {
74 74
			url = ((AnnotationType)selectedItem).getURL();
75 75
		} else if (selectedItem instanceof TypedValue) {
76
			url = ""; // TODO: see how to retrieve its KR
76
			url = ""; // TODO: see how to retrieve its KR //$NON-NLS-1$
77 77
		}
78 78
		
79 79
		if (url != null && url.length() > 0) {
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/ExportTable.java (revision 3823)
45 45
import org.txm.Toolbox;
46 46
import org.txm.annotation.kr.core.AnnotationManager;
47 47
import org.txm.annotation.kr.core.KRAnnotationEngine;
48
import org.txm.annotation.kr.rcp.messages.Messages;
48 49
import org.txm.rcp.StatusLine;
49
import org.txm.rcp.messages.TXMUIMessages;
50 50
import org.txm.rcp.swt.dialog.LastOpened;
51 51
import org.txm.rcp.utils.JobHandler;
52 52
import org.txm.searchengine.cqp.corpus.MainCorpus;
......
74 74
		
75 75
		Object s = selection.getFirstElement();
76 76
		if (!(s instanceof MainCorpus)) {
77
			Log.warning(NLS.bind("Selection is not a Corpus: {0}. Aborting.", s));
77
			Log.warning(NLS.bind(Messages.SelectionIsNotACorpusP0Aborting, s));
78 78
			return null;
79 79
		}
80 80
		
......
84 84
		MainCorpus corpus = (MainCorpus) s;
85 85
		String path = Toolbox.getTxmHomePath();
86 86
		dialog.setFilterPath(path); //To set a specific path
87
		dialog.setFileName(corpus.getID()+"_annotations.csv");
88
		dialog.setFilterExtensions(new String[]{"*.csv", "*.tsv"});
87
		dialog.setFileName(corpus.getID()+"_annotations.csv"); //$NON-NLS-1$
88
		dialog.setFilterExtensions(new String[]{"*.csv", "*.tsv"}); //$NON-NLS-1$ //$NON-NLS-2$
89 89
		if (dialog.open() != null) {
90
			StatusLine.setMessage(TXMUIMessages.exportingAnnotations);
90
			StatusLine.setMessage(Messages.exportingAnnotations);
91 91
			String filepath = dialog.getFilterPath();
92 92
			String filename = dialog.getFileName();
93 93
			
......
114 114
			protected IStatus run(IProgressMonitor monitor) {
115 115
				this.runInit(monitor);
116 116
				try {
117
					monitor.beginTask("Exporting annotations as standoff", 100);
117
					monitor.beginTask(Messages.ExportingAnnotationsAsStandOff, 100);
118 118
					
119
					monitor.setTaskName("Writing annotations in the table file: "+resultFile);
119
					monitor.setTaskName(Messages.WritingAnnotationsInTheTableFileP0+resultFile);
120 120
					/*if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Before saving annotations...", "All editors using this corpus are going to be closed. Continue ?")) {
121 121
						return false;
122 122
					}*/
......
125 125
					///chaque annotation est récupérée et selon l'annotateur, écrite dans un fichier spécifique à celui-ci
126 126
					
127 127
					if (!am.exportAnnotationsToTable(resultFile)) {
128
						Log.warning("Error while exporting annotations (see logs above).");
128
						Log.warning(Messages.ErrorWhileExportingAnnotations);
129 129
						return Status.CANCEL_STATUS;
130 130
					}
131 131
					monitor.worked(30);
132 132
					
133
					Log.info("Done.");
133
					Log.info(Messages.Done);
134 134
					
135 135
				} catch(Exception e) {
136
					Log.warning(NLS.bind("Error while saving annotations: {0}.", e));
136
					Log.warning(NLS.bind(Messages.ErrorWhileSavingAnnotationsP0, e));
137 137
					Log.printStackTrace(e);
138 138
					return Status.CANCEL_STATUS;
139 139
				}
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages.properties (revision 3823)
1
DeleteAnAnnotationType=Delete an AnnotationType...
1 2
#TXM messages generated by the PluginMessagesManager class
2 3
#Fri Jun 10 16:36:03 CEST 2022
4
DeleteALocalKR=Delete a LocalKnowledgeRepository...
5
Done=Done.
6
ErrorWhileImportingAnnotations=Error while importing annotations (see logs above).
7
ErrorWhileImportingAnnotationsP0=Error while importing annotations: {0}.
8
ErrorWhileSavingAnnotationsP0=Error while saving annotations: {0}.
9
ErrorWhileSavingStandOffAnnotations=Error while saving stand-off annotations (see logs above).
10
exportingAnnotations=Exporting annotations.
11
ExportingAnnotationsAsStandoff=Exporting annotations as standoff
12
SelectionIsNotACorpusAborting=Selection is not a Corpus: {0}. Aborting.
13
SelectionIsNotACorpusP0Aborting=Selection is not a Corpus: {0}. Aborting.
14
WritingAnnotationsInTheTableFileP0=Writing annotations in the table file: {0}.
15
WritingAnnotationsInXMLTXMStandOffFiles=Writing annotations in XML-TXM stand-off files
16

  
3 17
aboutAnnotations=About annotations
4 18
addANewCategory=Add a new category
5 19
affect=Assign
6 20
AffectP0ToSelectionEqualsP1=Assign {0} to {1} for {1} elements.
7 21
Annotation=Annotation
22
AskingCredentialForP0KRLogin=Asking credentials for {0} KR login.
8 23
all=All
9 24
allLines=all lines
10 25
annotatingConcordanceSelection=Annotating concordance selection…
......
17 32
concordanceAnnotationArea=Concordance Annotation area
18 33
confirmAnnotationAffectation=Confirm annotation assignment
19 34
couldNotAnnotateTheValueP0OnCertainSequences=** Can not annotate the value {0} on certain sequences.
35
CancelingLoginForP0KR=Cancelling login for {0} KR.
36
CQPAnnotationsImportedFromP0=CQP Annotations imported from 
20 37
CQPIndexesNotUpdatedOnlyTheXMLTXMFilesHaveBeenUpdated=CQP indexes not updated. Only the XML-TXM files have been updated. Call Update corpus later to access the annotations
38
ErrorDuringConnectionToTheP0KRPleaseCheckLogin=Error during connection to the ''{0}'' KR. Please check login, password and Internet connection.
39
ErrorWhileReadingAnnotationP0AndWithP1Matches=Error while reading annotation {0} and with {1} matches
21 40
ErrorWhileReadingTheP0KRValuesForTheP1Type=Error while reading the {0} KR values for the {1} type.
22 41
delete=Delete
23 42
enterAValueForAnId=Enter a value for an identifier
......
29 48
executionCanceled=Execution canceled.
30 49
FailToUpdateTheCorpusAborting=Fail to update the corpus. Aborting
31 50
FixXMLTXMFilesAndCallCommandUpdateCorpus=Fix XML-TXM files and call command 'UpdateCorpus'
51
ImportingAnnotationsAsStandOff=Importing annotations as standoff
32 52
keywordsAnnotation=Pivot annotation
33 53
KnowledgeRepositoryName=Knowledge repository name
34 54
listOfCategories=List of categories
......
46 66
PreserveAnnotationBetweenTXMSessions=Preserve annotations between TXM sessions
47 67
proceedToAnnotation=Proceed to annotation
48 68
property=Property
69
ReadingAnnotationsInTheTableFileP0=Reading annotations in the table file: 
49 70
SaveAnnotationsAndUpdateTheCorpus=Save Annotations and update the corpus.
50 71
SaveP0Annotations=Saving {0} annotations...
51 72
saveTheAnnotations=Save the annotations
......
64 85
UpdatingCorpusEditionsAndIndexes=Updating corpus editions and indexes
65 86
updatingTheP0Corpus=Updating the {0} corpus...
66 87
valueEquals=value\=
88
WarningP0KRIsNullPleaseCheckKRConfiguration=Warning ''{0}'' KR is null. Please check KR configuration.
67 89
withTheCategory=with the category
68 90
youAreAboutToAnnotateP0ElementsContinue=You are about to annotate {0} elements. Continue ?
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/Messages.java (revision 3823)
5 5

  
6 6
public class Messages extends NLS {
7 7
	private static final String BUNDLE_NAME = Messages.class.getPackageName() + ".messages"; //$NON-NLS-1$
8
	
9
	public static String DeleteALocalKR;
10

  
11
	public static String DeleteAnAnnotationType;
12

  
13
	public static String Done;
14
	public static String ErrorWhileExportingAnnotations;
15

  
16
	public static String ErrorWhileImportingAnnotations;
17

  
18
	public static String ErrorWhileImportingAnnotationsP0;
19
	public static String ErrorWhileSavingAnnotationsP0;
20

  
21
	public static String ErrorWhileSavingStandOffAnnotations;
22
	public static String exportingAnnotations;
23
	public static String ExportingAnnotationsAsStandoff;
24

  
25
	public static String ExportingAnnotationsAsStandOff;
26
	public static String SelectionIsNotACorpusAborting;
27

  
28
	public static String SelectionIsNotACorpusP0Aborting;
29
	public static String WritingAnnotationsInTheTableFileP0;
30

  
31
	public static String WritingAnnotationsInXMLTXMStandOffFiles;
32
	
8 33
	public static String BeforeSavingAnnotations;
34
	public static String CancelingLoginForP0KR;
35
	public static String CQPAnnotationsImportedFromP0;
36

  
9 37
	public static String CQPIndexesNotUpdatedOnlyTheXMLTXMFilesHaveBeenUpdated;
10 38
	public static String executionCanceled;
11 39
	public static String FailToUpdateTheCorpusAborting;
......
18 46
	public static String UpdateOptions;
19 47
	public static String UpdatingCorpus;
20 48
	public static String UpdatingCorpusEditionsAndIndexes;
49
	public static String ErrorDuringConnectionToTheP0KRPleaseCheckLogin;
50
	public static String ErrorWhileReadingAnnotationP0AndWithP1Matches;
51

  
21 52
	public static String ErrorWhileReadingTheP0KRValuesForTheP1Type;
22 53
	
23 54
	public static String availableValuesForP0; 
......
40 71
	public static String lookingForTypedValueWithIdEqualsP0; 
41 72
	public static String noValueFoundWithTheP0Id; 
42 73
	public static String AffectP0ToSelectionEqualsP1;
43
	public static String Annotation; 
74
	public static String Annotation;
75
	public static String AskingCredentialForP0KRLogin; 
44 76
	public static String couldNotAnnotateTheValueP0OnCertainSequences; 
45 77
	public static String theSequenceP0IsOverlappingWith; 
46 78
	public static String theEndOfAStructureP0AtP1P2; 
......
67 99
	public static String squencesDeMotsCatgorie; 
68 100
	public static String motsPropritsInfDfaut; 
69 101
	public static String all;
102

  
103
	public static String ImportingAnnotationsAsStandOff;
70 104
	public static String KnowledgeRepositoryName; 
71 105
	public static String nouvelleProprit; 
72 106
	public static String nomDeLaPropritPatternEqualsazaz09Plus;
73 107
	public static String PreserveAnnotationBetweenTXMSessions; 
74 108
	public static String property;
75 109

  
76
	public static String updatingTheP0Corpus; 
110
	public static String ReadingAnnotationsInTheTableFileP0;
111

  
112
	public static String updatingTheP0Corpus;
113
	public static String WarningP0KRIsNullPleaseCheckKRConfiguration; 
77 114
	
78 115
	static {
79 116
		// initialize resource bundle
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/edition/EditionAnnotations.java (revision 3823)
54 54

  
55 55
		CQPCorpus corpus = this.editor.getCorpus();
56 56
		
57
		int[] indexes = CQPSearchEngine.getCqiClient().str2Id(corpus.getProperty("id").getQualifiedName(), new String[] {startID, endID});
58
		int[] startEndPositions = CQPSearchEngine.getCqiClient().idList2Cpos(corpus.getProperty("id").getQualifiedName(), indexes);
57
		int[] indexes = CQPSearchEngine.getCqiClient().str2Id(corpus.getProperty("id").getQualifiedName(), new String[] {startID, endID}); //$NON-NLS-1$
58
		int[] startEndPositions = CQPSearchEngine.getCqiClient().idList2Cpos(corpus.getProperty("id").getQualifiedName(), indexes); //$NON-NLS-1$
59 59
		int[] allPositions = MatchUtils.toPositions(startEndPositions[1], startEndPositions[0]);
60
		String[] allWordIDS = CQPSearchEngine.getCqiClient().cpos2Str(corpus.getProperty("id").getQualifiedName(), allPositions);
60
		String[] allWordIDS = CQPSearchEngine.getCqiClient().cpos2Str(corpus.getProperty("id").getQualifiedName(), allPositions); //$NON-NLS-1$
61 61
		
62 62
		HashMap<Match, String> matches = new HashMap<Match, String>();
63 63
		for (int i = 0 ; i < allWordIDS.length ; i++) {
......
81 81
	}
82 82
	
83 83
	private String findAnnotationForString(Match match, List<Annotation> annots, boolean overlap) {
84
		String annotationValue = "";
84
		String annotationValue = ""; //$NON-NLS-1$
85 85
		if (annots!=null) {
86 86
			if (!annots.isEmpty()) {
87 87
				for (Annotation annot : annots) {
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/ConcordanceAnnotations.java (revision 3823)
13 13
import org.txm.annotation.kr.core.KRAnnotationEngine;
14 14
import org.txm.annotation.kr.core.repository.AnnotationType;
15 15
import org.txm.annotation.kr.core.repository.TypedValue;
16
import org.txm.annotation.kr.rcp.messages.Messages;
16 17
import org.txm.concordance.core.functions.Concordance;
17 18
import org.txm.concordance.core.functions.Line;
18 19
import org.txm.objects.Match;
......
92 93
	}
93 94
	
94 95
	private String findAnnotationForLine(Match match, List<Annotation> annots, boolean overlap) {
95
		String annotationValue = "";
96
		String annotationValue = ""; //$NON-NLS-1$
96 97
		if (annots!=null) {
97 98
			if (!annots.isEmpty()) {
98 99
				for (Annotation annot : annots) {
......
220 221
				annotationsPerMatch = am.getAnnotationsForMatches(viewAnnotation, subsetMatch, overlapAnnotation);
221 222
				//System.out.println("annotationsPerMatch: "+annotationsPerMatch);
222 223
			} catch (Exception e) {
223
				Log.warning(NLS.bind("Error while reading annotation {0} and with {1} matches", viewAnnotation, subsetMatch.size()));
224
				Log.warning(NLS.bind(Messages.ErrorWhileReadingAnnotationP0AndWithP1Matches, viewAnnotation, subsetMatch.size()));
224 225
				Log.printStackTrace(e);
225 226
			}
226 227
		}
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/AnnotationLineDecorator.java (revision 3823)
20 20
		
21 21
		if (annotation != null) {
22 22
			if (currentPos == annotation.getStart()) {
23
				return "< "+str;
23
				return "< "+str; //$NON-NLS-1$
24 24
			} else if (currentPos == annotation.getEnd()) {
25
				return str+" >";
25
				return str+" >"; //$NON-NLS-1$
26 26
			}
27 27
		}
28 28
		return str;

Formats disponibles : Unified diff