Révision 3884

TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/edition/EditionAnnotations.java (revision 3884)
12 12
import org.txm.annotation.kr.core.KRAnnotationEngine;
13 13
import org.txm.annotation.kr.core.repository.AnnotationType;
14 14
import org.txm.annotation.kr.core.repository.TypedValue;
15
import org.txm.annotation.kr.rcp.messages.Messages;
15 16
import org.txm.concordance.core.functions.Concordance;
16 17
import org.txm.edition.rcp.editors.SynopticEditionEditor;
17 18
import org.txm.objects.Match;
......
209 210
				annotationsPerMatch = am.getAnnotationsForMatches(viewAnnotation, subsetMatch, overlapAnnotation);
210 211
				//System.out.println("annotationsPerMatch: "+annotationsPerMatch);
211 212
			} catch (Exception e) {
212
				Log.warning(NLS.bind("Error while reading annotation {0} and with {1} matches", viewAnnotation, subsetMatch.size()));
213
				Log.warning(NLS.bind(Messages.errorWhileReadingAnnotationP0AndWithP1Matches, viewAnnotation, subsetMatch.size()));
213 214
				Log.printStackTrace(e);
214 215
			}
215 216
		}
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/SaveAnnotations.java (revision 3884)
14 14
import org.eclipse.ui.handlers.HandlerUtil;
15 15
import org.txm.annotation.kr.core.AnnotationManager;
16 16
import org.txm.annotation.kr.core.KRAnnotationEngine;
17
import org.txm.annotation.kr.rcp.messages.Messages;
17 18
import org.txm.rcp.messages.TXMUIMessages;
18 19
import org.txm.rcp.utils.JobHandler;
19 20
import org.txm.rcp.utils.SWTEditorsUtils;
......
61 62
			return null;
62 63
		}
63 64
		
64
		JobHandler jobhandler = new JobHandler(NLS.bind("Saving annotations of {0}", corpus)) {
65
		JobHandler jobhandler = new JobHandler(NLS.bind(Messages.savingAnnotationsOfP0, corpus)) {
65 66
			
66 67
			@Override
67 68
			protected IStatus run(IProgressMonitor monitor) {
......
72 73
					monitor.worked(30);
73 74
					
74 75
					if (rez) {
75
						Log.fine("Annotations are saved in XML-TXM files. Updating corpus indexes and editions");
76
						Log.fine(Messages.annotationsAreSavedInXMLTXMFiles);
76 77
						// close all opened editors of all children corpus
77 78
						SWTEditorsUtils.closeEditors(corpus.getProject(), true);
78 79
					}
79 80
					else {
80
						Log.warning("** Error while saving annotations (see logs above).");
81
						Log.warning(Messages.errorWhileSavingAnnotations);
81 82
					}
82 83
				}
83 84
				catch (Exception e) {
84
					Log.warning(NLS.bind("Error while saving annotations: {0}", e));
85
					Log.warning(NLS.bind(Messages.errorWhileSavingAnnotationsP0, e));
85 86
					Log.printStackTrace(e);
86 87
					return Status.CANCEL_STATUS;
87 88
				} catch(ThreadDeath ex) {
88
					Log.info(TXMUIMessages.executionCanceled);
89
					Log.info(Messages.executionCanceled);
89 90
					return Status.CANCEL_STATUS;
90 91
				}
91 92
				return Status.OK_STATUS;
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/krview/Add.java (revision 3884)
43 43
import org.txm.annotation.kr.core.repository.LocalKnowledgeRepository;
44 44
import org.txm.annotation.kr.core.repository.SQLKnowledgeRepository;
45 45
import org.txm.annotation.kr.core.repository.TypedValue;
46
import org.txm.annotation.kr.rcp.messages.Messages;
46 47
import org.txm.annotation.kr.rcp.views.knowledgerepositories.KRView;
47 48
import org.txm.utils.AsciiUtils;
48 49
import org.txm.utils.logger.Log;
......
78 79
		} else if (selectedItem instanceof LocalKnowledgeRepository) {
79 80
			LocalKnowledgeRepository kr = ((LocalKnowledgeRepository)selectedItem);
80 81
			Shell shell = Display.getDefault().getActiveShell();
81
			InputDialog dialog = new InputDialog(shell, "Type name", "Please enter the new type name", "", null);
82
			InputDialog dialog = new InputDialog(shell, Messages.typeName, Messages.pleaseEnterTheNewTypeName, "", null); //$NON-NLS-3$
82 83
			if (dialog.open() == InputDialog.OK) {
83 84
				String name = dialog.getValue();
84 85
				String id = AsciiUtils.buildId(name);
......
91 92
				KRView.refresh();
92 93
				//kr.add(at);
93 94
			} else {
94
				Log.info("Creation aborted.");
95
				Log.info(Messages.creationAborted);
95 96
			}
96 97
		} else if (selectedItem instanceof AnnotationType) {
97 98
			AnnotationType t = ((AnnotationType)selectedItem);
......
104 105
				LocalKnowledgeRepository lkr = ((LocalKnowledgeRepository)kr);
105 106

  
106 107
				Shell shell = Display.getDefault().getActiveShell();
107
				InputDialog dialog = new InputDialog(shell, "Value name", "Please enter the new value name", "", null);
108
				InputDialog dialog = new InputDialog(shell, Messages.valueName, Messages.pleaseEnterTheNewValueName, "", null); //$NON-NLS-3$
108 109
				if (dialog.open() == InputDialog.OK) {
109 110
					String name = dialog.getValue();
110 111
					String id = name;
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/Messages.java (revision 3884)
76 76
	public static String couldNotAnnotateTheValueP0OnCertainSequences; 
77 77
	public static String theSequenceP0IsOverlappingWith; 
78 78
	public static String theEndOfAStructureP0AtP1P2; 
79
	public static String theStartOfAStructureP0AtP1P2; 
79
	public static String theStartOfAStructureP0AtP1P2;
80

  
81
	public static String typeName; 
80 82
	public static String aboutAnnotations; 
81
	public static String errorWhileAffectionAnnotationColonP0; 
82
	public static String saveTheAnnotations; 
83
	public static String errorWhileAffectionAnnotationColonP0;
84

  
85
	public static String errorWhileReadingAnnotationP0AndWithP1Matches;
86

  
87
	public static String errorWhileSavingAnnotations;
88

  
89
	public static String errorWhileSavingAnnotationsP0; 
90
	public static String saveTheAnnotations;
91

  
92
	public static String savingAnnotationsOfP0; 
83 93
	public static String openTheListOfCategories; 
84 94
	public static String selectAValueAmongTheList; 
85
	public static String valueEquals; 
86
	public static String pleaseEnterTheNewTypeName; 
95
	public static String valueEquals;
96

  
97
	public static String valueName; 
98
	public static String pleaseEnterTheNewTypeName;
99

  
100
	public static String pleaseEnterTheNewValueName; 
87 101
	public static String newCategory; 
88 102
	public static String withTheCategory; 
89 103
	public static String oK; 
......
92 106
	public static String listOfCategories; 
93 107
	public static String squencesDeMotsCatgorievaleur; 
94 108
	public static String closeTheToolbarWithoutSaving; 
95
	public static String annotationCanceledByUser; 
109
	public static String annotationCanceledByUser;
110

  
111
	public static String annotationsAreSavedInXMLTXMFiles; 
96 112
	public static String availableAnnotationTypesColonP0; 
97 113
	public static String errorColonNoSuitableKnowledgeRepositoryFound; 
98
	public static String concordanceAnnotationArea; 
114
	public static String concordanceAnnotationArea;
115

  
116
	public static String creationAborted; 
99 117
	public static String squencesDeMotsCatgorie; 
100 118
	public static String motsPropritsInfDfaut; 
101 119
	public static String all;
TXM/trunk/bundles/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages.properties (revision 3884)
24 24
allLines=all lines
25 25
annotatingConcordanceSelection=Annotating concordance selection…
26 26
annotationCanceledByUser=Annotation canceled by user.
27
annotationsAreSavedInXMLTXMFiles=Annotations are saved in XML-TXM files. Updating corpus indexes and editions
27 28
availableAnnotationTypesColonP0=Available annotation types\: {0}
28 29
availableValuesForP0=Available values for {0}
29 30
BeforeSavingAnnotations=Before saving annotations...
......
32 33
concordanceAnnotationArea=Concordance Annotation area
33 34
confirmAnnotationAffectation=Confirm annotation assignment
34 35
couldNotAnnotateTheValueP0OnCertainSequences=** Can not annotate the value {0} on certain sequences.
36
creationAborted=Creation aborted.
35 37
CancelingLoginForP0KR=Cancelling login for {0} KR.
36 38
CQPAnnotationsImportedFromP0=CQP Annotations imported from 
37 39
CQPIndexesNotUpdatedOnlyTheXMLTXMFilesHaveBeenUpdated=CQP indexes not updated. Only the XML-TXM files have been updated. Call Update corpus later to access the annotations
......
45 47
errorWhileAnnotatingConcordanceColonP0=** Error while annotating concordance\:  {0}
46 48
errorWhileAnnotatingConcordanceSelectionColonP0=** Error while annotating concordance selection\: {0}
47 49
errorWhileDeletingAnnotationColonP0=** Error while deleting annotation\: {0}
50
errorWhileReadingAnnotationP0AndWithP1Matches=Error while reading annotation {0} and with {1} matches
51
errorWhileSavingAnnotations=** Error while saving annotations (see logs above).
52
errorWhileSavingAnnotationsP0=Error while saving annotations: {0}
48 53
executionCanceled=Execution canceled.
49 54
FailToUpdateTheCorpusAborting=Fail to update the corpus. Aborting
50 55
FixXMLTXMFilesAndCallCommandUpdateCorpus=Fix XML-TXM files and call command 'UpdateCorpus'
......
63 68
oK=OK
64 69
openTheListOfCategories=Open the list of categories
65 70
pleaseEnterTheNewTypeName=Enter the name of the new category
71
pleaseEnterTheNewTypeName=Please enter the new type name
72
pleaseEnterTheNewValueName=Please enter the new value name
66 73
PreserveAnnotationBetweenTXMSessions=Preserve annotations between TXM sessions
67 74
proceedToAnnotation=Proceed to annotation
68 75
property=Property
......
70 77
SaveAnnotationsAndUpdateTheCorpus=Save Annotations and update the corpus.
71 78
SaveP0Annotations=Saving {0} annotations...
72 79
saveTheAnnotations=Save the annotations
80
savingAnnotationsOfP0=Saving annotations of {0}
73 81
selectAValueAmongTheList=Select a value among the list
74 82
selectedLines=selected lines
75 83
squencesDeMotsCatgorie=Words sequence (category)
......
78 86
theSequenceP0IsOverlappingWith=\ - The sequence {0} is overlapping with  
79 87
theStartOfAStructureP0AtP1P2=\  - the start of a structure {0} at [{1}-{2}] 
80 88
theValueP0IsNotAssociatedWithTheCategoryP1AssociateIt=The {0} value is not associated with the category {1}. Associate it?   
89
typeName=Type name
81 90
UpdateCorpusAfterWritingTheAnnotations=Update corpus after writing the annotations (warning the annotations won't be visible but saved in the XML-TXM files)
82 91
UpdateEdition=Update editions
83 92
UpdateOptions=Update options
......
85 94
UpdatingCorpusEditionsAndIndexes=Updating corpus editions and indexes
86 95
updatingTheP0Corpus=Updating the {0} corpus...
87 96
valueEquals=value\=
97
valueName=Value name
88 98
WarningP0KRIsNullPleaseCheckKRConfiguration=Warning ''{0}'' KR is null. Please check KR configuration.
89 99
withTheCategory=with the category
90 100
youAreAboutToAnnotateP0ElementsContinue=You are about to annotate {0} elements. Continue ?

Formats disponibles : Unified diff