Révision 3837

TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/BackToText.java (revision 3837)
100 100
	@Override
101 101
	public Object execute(ExecutionEvent event) throws ExecutionException {
102 102
		
103
		String wordid = event.getParameter("org.txm.edition.rcp.handlers.BackToText.wordid");
104
		String textid = event.getParameter("org.txm.edition.rcp.handlers.BackToText.textid");
105
		String editionid = event.getParameter("org.txm.edition.rcp.handlers.BackToText.editionid");
106
		String corpusid = event.getParameter("org.txm.edition.rcp.handlers.BackToText.corpusid");
103
		String wordid = event.getParameter("org.txm.edition.rcp.handlers.BackToText.wordid"); //$NON-NLS-1$
104
		String textid = event.getParameter("org.txm.edition.rcp.handlers.BackToText.textid"); //$NON-NLS-1$
105
		String editionid = event.getParameter("org.txm.edition.rcp.handlers.BackToText.editionid"); //$NON-NLS-1$
106
		String corpusid = event.getParameter("org.txm.edition.rcp.handlers.BackToText.corpusid"); //$NON-NLS-1$
107 107
		if (corpusid != null) { // minimal parameter is the corpus id
108 108
			try {
109 109
				IWorkbenchWindow wb = HandlerUtil.getActiveWorkbenchWindow(event);
110 110
				IEditorPart ieditor = wb.getActivePage().getActiveEditor();
111 111
				
112
				if (!backToText(ieditor, corpusid, Arrays.asList(editionid.split("||")), textid, wordid)) {
113
					System.out.println("Could not open edition for wordid=" + wordid + " textid=" + textid + " edition=" + editionid);
112
				if (!backToText(ieditor, corpusid, Arrays.asList(editionid.split("||")), textid, wordid)) { //$NON-NLS-1$
113
					System.out.println(EditionUIMessages.CouldNotOpenEditionForWordIdP0TextIdP1AndEditionP2 + wordid + " textid=" + textid + " edition=" + editionid); //$NON-NLS-2$ //$NON-NLS-3$
114 114
				}
115 115
			}
116 116
			catch (Exception e) {
......
147 147
		MainCorpus corpus = CorpusManager.getCorpusManager().getCorpus(corpusid);
148 148
		
149 149
		if (corpus == null) {
150
			System.out.println("Error: no corpus with ID=" + corpusid);
150
			System.out.println(EditionUIMessages.ErrorNoCorpusWithIDP0 + corpusid);
151 151
		}
152 152
		
153 153
		if (editions != null && !corpus.getProject().getBuiltEditionNames().containsAll(editions)) {
154
			System.out.println("Warning: corpus has no edition with id=" + editions);
155
			editions = Arrays.asList("default");
154
			System.out.println(EditionUIMessages.WarningCorpusHasNoEditionNamedP0 + editions);
155
			editions = Arrays.asList("default"); //$NON-NLS-1$
156 156
		}
157 157
		
158 158
		if (!corpus.getProject().getBuiltEditionNames().containsAll(editions)) {
159
			System.out.println("Error: corpus has no default edition.");
160
			System.out.println("Availables: " + corpus.getProject().getEditionNames());
159
			System.out.println(EditionUIMessages.ErrorCorpusHasNoDefaultEdition);
160
			System.out.println(EditionUIMessages.AvailablesP0 + corpus.getProject().getEditionNames());
161 161
			return false;
162 162
		}
163 163
		
......
175 175
		if (textid != null) {
176 176
			text = corpus.getProject().getText(textid);
177 177
			if (text == null) {
178
				System.out.println("Error: corpus has no text with id=" + textid);
178
				System.out.println(EditionUIMessages.ErrorCorpusHasNoTextWithIDP0 + textid);
179 179
				return false;
180 180
			}
181 181
		}
182 182
		else {
183 183
			text = corpus.getProject().getText(corpus.getCorpusTextIdsList()[0]);
184 184
			if (text == null) {
185
				System.out.println("Error: corpus has no text.");
185
				System.out.println(EditionUIMessages.ErrorCorpusHasNoText);
186 186
				return false;
187 187
			}
188 188
		}
......
215 215
			String textid = ""; //$NON-NLS-1$
216 216
			String baseid = ""; //$NON-NLS-1$
217 217
			
218
			Property xProperty = corpus.getProperty("x"), yProperty, wProperty, hProperty;
219
			String x = "0", y = "0", w = "0", h = "0";
218
			Property xProperty = corpus.getProperty("x"), yProperty, wProperty, hProperty; //$NON-NLS-1$
219
			String x = "0", y = "0", w = "0", h = "0"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
220 220
			int[] pos = null;
221 221
			if (xProperty != null) {
222
				yProperty = corpus.getProperty("y");
222
				yProperty = corpus.getProperty("y"); //$NON-NLS-1$
223 223
				if (yProperty != null) {
224
					wProperty = corpus.getProperty("w");
224
					wProperty = corpus.getProperty("w"); //$NON-NLS-1$
225 225
					if (wProperty != null) {
226 226
						AbstractCqiClient CQI = CQPSearchEngine.getCqiClient();
227 227
						int[] cpos = { match.getStart() };
228
						hProperty = corpus.getProperty("h");
228
						hProperty = corpus.getProperty("h"); //$NON-NLS-1$
229 229
						if (hProperty != null) {
230 230
							x = CQI.cpos2Str(xProperty.getQualifiedName(), cpos)[0];
231 231
							y = CQI.cpos2Str(yProperty.getQualifiedName(), cpos)[0];
......
254 254
				return false;
255 255
			}
256 256
			
257
			Log.fine("Loading line informations...");
257
			Log.fine("Loading line informations..."); //$NON-NLS-1$
258 258
			
259 259
			SynopticEditionEditor l_editor = editor.getLinkedEditor(SynopticEditionEditor.class);
260 260
			SynopticEditionEditor attachedBrowserEditor = null;
......
286 286
					}
287 287
				}
288 288
				else {
289
					Log.fine(NLS.bind(EditionUIMessages.openingDefaultEditionsColonP0, StringUtils.join(editionsToOpen, ", ")));
289
					Log.fine(NLS.bind(EditionUIMessages.openingDefaultEditionsColonP0, StringUtils.join(editionsToOpen, ", "))); //$NON-NLS-1$
290 290
				}
291 291
				
292 292
				attachedBrowserEditor = OpenEdition.openEdition(corpus, editionsToOpen);
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/SendEditionTo.java (revision 3837)
32 32
import org.eclipse.osgi.util.NLS;
33 33
import org.txm.core.results.TXMResult;
34 34
import org.txm.edition.rcp.editors.SynopticEditionEditor;
35
import org.txm.edition.rcp.messages.EditionUIMessages;
35 36
import org.txm.links.rcp.handlers.SendSelectionToQueryable;
36 37
import org.txm.objects.Edition;
37 38
import org.txm.objects.Project;
......
77 78
					String textid = edition.getText().getName();
78 79
					CQPCorpus corpus = seditor.getCorpus();// (CQPCorpus) project.getCorpusBuild(null, MainCorpus.class);
79 80
					if (corpus == null) {
80
						String ncorpus = edition.getStringParameterValue("corpus");
81
						String ncorpus = edition.getStringParameterValue("corpus"); //$NON-NLS-1$
81 82
						if (ncorpus != null && ncorpus.length() > 0) {
82 83
							corpus = (CQPCorpus) project.getCorpusBuild(ncorpus);
83 84
						}
......
89 90
					Match n = null;
90 91
					
91 92
					if (wordids[1] == null) {
92
						CQLQuery cqlQuery = new CQLQuery(NLS.bind("[id=\"{0}\" & _.text_id=\"{1}\"]", wordids[0], textid));
93
						CQLQuery cqlQuery = new CQLQuery(NLS.bind("[id=\"{0}\" & _.text_id=\"{1}\"]", wordids[0], textid)); //$NON-NLS-1$
93 94
						
94
						QueryResult rez = corpus.query(cqlQuery, "TMP", false);
95
						QueryResult rez = corpus.query(cqlQuery, "TMP", false); //$NON-NLS-1$
95 96
						
96 97
						if (rez.getNMatch() == 0) {
97
							Log.warning(NLS.bind("Warning: found no word for id={0} in {1}", wordids[0], textid));
98
							Log.warning(NLS.bind(EditionUIMessages.WarningNoWordFoundForIdPOInTheP1Text, wordids[0], textid));
98 99
							return null;
99 100
						} else if (rez.getNMatch() > 1) {
100
							Log.warning(NLS.bind("Warning: found more than one word for id={0} in {1}", wordids[0], textid));
101
							Log.warning(NLS.bind(EditionUIMessages.WarningFoundMoreThanOneWordForIdP0InTheP1Text, wordids[0], textid));
101 102
						}
102 103
						
103 104
						m = rez.getMatch(0);
104 105
						n = rez.getMatch(0);
105 106
					}
106 107
					else if (wordids[0] != null && wordids[1] != null) {
107
						CQLQuery cqlQuery = new CQLQuery(NLS.bind("[id=\"{0}\" & _.text_id=\"{1}\"]", wordids[0] + "|" + wordids[1], textid));
108
						QueryResult rez = corpus.query(cqlQuery, "TMP", false);
108
						CQLQuery cqlQuery = new CQLQuery(NLS.bind("[id=\"{0}\" & _.text_id=\"{1}\"]", wordids[0] + "|" + wordids[1], textid)); //$NON-NLS-1$ //$NON-NLS-2$
109
						QueryResult rez = corpus.query(cqlQuery, "TMP", false); //$NON-NLS-1$
109 110
						
110 111
						if (rez.getNMatch() != 2) {
111
							Log.warning(NLS.bind("Warning: found more than or no word for id={0} in {1}", wordids[0] + ", " + wordids[1], textid));
112
							Log.warning(NLS.bind(EditionUIMessages.WarningFoundMoreThanOneWordForIdP0InTheP1Text, wordids[0] + ", " + wordids[1], textid)); //$NON-NLS-2$
112 113
							return null;
113 114
						}
114 115
						
......
118 119
					
119 120
					int[] positions = MatchUtils.toPositions(m, n);
120 121
					if (positions.length > 0) {
121
						WordProperty p = corpus.getProperty("word");
122
						WordProperty p = corpus.getProperty("word"); //$NON-NLS-1$
122 123
						String[] words = CQPSearchEngine.getCqiClient().cpos2Str(p.getQualifiedName(), positions);
123 124
						if (words != null && words.length > 0) {
124
							query = "";
125
							query = ""; //$NON-NLS-1$
125 126
							for (String w : words) {
126
								query += " \"" + CQLQuery.addBackSlash(w) + "\"";
127
								query += " \"" + CQLQuery.addBackSlash(w) + "\""; //$NON-NLS-1$ //$NON-NLS-2$
127 128
							}
128 129
							query = query.substring(1);
129 130
						}
130 131
					}
131 132
				}
132 133
				catch (Exception e) {
133
					Log.warning("Error: " + e);
134
					Log.warning(EditionUIMessages.ErrorP0 + e);
134 135
					Log.printStackTrace(e);
135 136
				}
136 137
			}
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java (revision 3837)
98 98
					}
99 99
				}
100 100
				else {
101
					Log.fine(NLS.bind(EditionUIMessages.openingDefaultEditionsColonP0, StringUtils.join(editionsToOpen, ", ")));
101
					Log.fine(NLS.bind(EditionUIMessages.openingDefaultEditionsColonP0, StringUtils.join(editionsToOpen, ", "))); //$NON-NLS-1$
102 102
				}
103 103
				
104 104
				editor = openEdition(c, editionsToOpen);
......
183 183
			
184 184
			String[] availables = corpus.getCorpusTextIdsList();
185 185
			if (availables.length == 0) {
186
				Log.warning(NLS.bind("Error: No text available in the {0} corpus", corpus));
186
				Log.warning(NLS.bind(EditionUIMessages.ErrorNoTextAvailableInTheP0Corpus, corpus));
187 187
				return null;
188 188
			}
189 189
			Text text = corpus.getProject().getText(availables[0]);
190 190
			if (text == null) {
191
				Log.warning(NLS.bind("Error: No {0} text in the {1} corpus", availables[0], corpus));
191
				Log.warning(NLS.bind(EditionUIMessages.ErrorNoP0TextInTheP1Corpus, availables[0], corpus));
192 192
				return null;
193 193
			}
194 194
			// QueryResult result = corpus.query(new Query("<text> []"), "get_edition", false); //$NON-NLS-1$ //$NON-NLS-2$
......
211 211
				
212 212
			} else {
213 213
				if (editions == null) {
214
					String[] defaultEditions = corpus.getProject().getDefaultEditionName().split(",");
214
					String[] defaultEditions = corpus.getProject().getDefaultEditionName().split(","); //$NON-NLS-1$
215 215
					editions = Arrays.asList(defaultEditions);
216 216
				}
217 217
				editor.removeHighlightWords();
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/preferences/SynopticEditionPreferencePage.java (revision 3837)
25 25
	public void init(IWorkbench workbench) {
26 26
		this.setPreferenceStore(new TXMPreferenceStore(SynopticEditionPreferences.getInstance().getPreferencesNodeQualifier()));
27 27
		this.setTitle(EditionUIMessages.edition);
28
		this.setImageDescriptor(IImageKeys.getImageDescriptor(SynopticEditionPreferencePage.class, "icons/edition.png"));
28
		this.setImageDescriptor(IImageKeys.getImageDescriptor(SynopticEditionPreferencePage.class, "icons/edition.png")); //$NON-NLS-1$
29 29
	}
30 30

  
31 31
	@Override
......
34 34
		addField(fast_highlight);
35 35
		
36 36
		String[][] values = {
37
				{"RATIO", "-2"}, 
38
				{"OVER", "-1"}, 
39
				{"ABOVE", ""+EModelService.ABOVE}, 
40
				{"BELOW", ""+EModelService.BELOW}, 
41
				{"LEFT_OF", ""+EModelService.LEFT_OF}, 
42
				{"RIGHT_OF", ""+EModelService.RIGHT_OF}};
37
				{"RATIO", "-2"},  //$NON-NLS-1$ //$NON-NLS-2$
38
				{"OVER", "-1"},  //$NON-NLS-1$ //$NON-NLS-2$
39
				{"ABOVE", ""+EModelService.ABOVE},  //$NON-NLS-1$ //$NON-NLS-2$
40
				{"BELOW", ""+EModelService.BELOW},  //$NON-NLS-1$ //$NON-NLS-2$
41
				{"LEFT_OF", ""+EModelService.LEFT_OF},  //$NON-NLS-1$ //$NON-NLS-2$
42
				{"RIGHT_OF", ""+EModelService.RIGHT_OF}}; //$NON-NLS-1$ //$NON-NLS-2$
43 43
		
44
		backtotext_position = new ComboFieldEditor(SynopticEditionPreferences.BACKTOTEXT_POSITION, "Linked editor position", values, getFieldEditorParent());
44
		backtotext_position = new ComboFieldEditor(SynopticEditionPreferences.BACKTOTEXT_POSITION, EditionUIMessages.LinkedEditorOpeningPosition, values, getFieldEditorParent());
45 45
		addField(backtotext_position);
46 46
	}
47 47
	
48 48
	public boolean performOk() {
49 49
		boolean b = super.performOk();
50 50
		String v = SynopticEditionPreferences.getInstance().getString(SynopticEditionPreferences.BACKTOTEXT_POSITION);
51
		System.out.println("v="+v);
51
		System.out.println("v="+v); //$NON-NLS-1$
52 52
		return b;
53 53
	}
54 54
}
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/EditionUIMessages.java (revision 3837)
22 22
	public static String selectOneOrMoreEditions; 
23 23
	public static String controls; 
24 24

  
25
	public static String CommandLink_empty; 
25
	public static String CommandLink_empty;
26 26

  
27
	public static String CouldNotOpenEditionForWordIdP0TextIdP1AndEditionP2; 
28

  
27 29
	public static String pageButtons; 
28 30

  
29 31
	public static String textButtons; 
......
45 47
	public static String errorWhileOpeningEditorColonP0; 
46 48
	public static String errorWhileOpeningEditionColonP0; 
47 49
	public static String couldNotFindFirstTextOfP0IDInTheCorpus; 
48
	public static String abortingColonSelectionIsNotACorpus; 
50
	public static String abortingColonSelectionIsNotACorpus;
51

  
52
	public static String AvailablesP0;
53

  
54
	public static String BrowserEvaluateErrorP0;
55

  
56
	public static String BrowserExecuteErrorP0; 
49 57
	public static String firstTextOfTheCorpus; 
50 58
	public static String previousText; 
51 59
	public static String nextText; 
......
73 81
	
74 82
	public static String errorColonTxmeditioncorpusidEditionidTextidWordidCalledWithNoArguments;
75 83

  
84
	public static String EditionLink_1;
85

  
86
	public static String ErrorCorpusHasNoDefaultEdition;
87

  
88
	public static String ErrorCorpusHasNoText;
89

  
90
	public static String ErrorCorpusHasNoTextWithIDP0;
91

  
92
	public static String ErrorNoCorpusWithIDP0;
93

  
94
	public static String ErrorNoP0TextInTheP1Corpus;
95

  
96
	public static String ErrorNoTextAvailableInTheP0Corpus;
97

  
98
	public static String ErrorNoTextFoundwithIDP0;
99

  
100
	public static String ErrorNoTextFoundWiththeP0Id;
101

  
102
	public static String ErrorNoTextFoundWithTheP0Id;
103

  
104
	public static String ErrorP0;
105

  
106
	public static String ErrorP0IsNotReadyToUse;
107

  
108
	public static String InitialZoom;
109

  
110
	public static String LinkedEditorOpeningPosition;
111

  
112
	public static String NoHits;
113

  
114
	public static String OpeningConcordancesOfQueryP0;
115

  
116
	public static String P0Hits;
117

  
76 118
	public static String text;
77 119

  
78
	public static String page; 
120
	public static String page;
121

  
122
	public static String Search;
123

  
124
	public static String SearchingForP0InTheP1Corpus;
125

  
126
	public static String TXMCouldNotOpenTheSWTInternalBrowser;
127

  
128
	public static String WarningCorpusHasNoEditionNamedP0;
129

  
130
	public static String WarningFoundMoreThanOneWordForIdP0InTheP1Text;
131

  
132
	public static String WarningNoWordFoundForIdPOInTheP1Text;
133

  
134
	public static String ZoomIn;
135

  
136
	public static String ZoomOut; 
79 137
	
80 138
	static {
81 139
		// initialize resource bundle
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/messages.properties (revision 3837)
1 1
#TXM messages generated by the PluginMessagesManager class
2 2
#Fri Jun 10 16:36:03 CEST 2022
3 3
abortingColonSelectionIsNotACorpus=Aborting\: selection is not a corpus
4
AvailablesP0=Availables: {0}
4 5
back=Back
6
BrowserEvaluateErrorP0=Browser evaluate error: 
7
BrowserExecuteErrorP0=Browser execute error: 
5 8
cannotCallTxmcommandWithoutIdParameterColonP0=** Can not call a command without the ''id'' parameter ({0})
6 9
CommandLink_empty=
10
CouldNotOpenEditionForWordIdP0TextIdP1AndEditionP2=Could not open edition for wordid={0} textid={1} and edition={2}
7 11
controls=controls
8 12
copyTextSelection=Copy text selection
9 13
couldNotFindFirstTextOfP0IDInTheCorpus=** Failed to find text of ID {0} in the corpus.
......
13 17
error_while_reading=** Error while reading {0}\: {1}
14 18
errorColonCouldNotRetrieveLineWordIdsAbortingBackToText=** Error\: could not retrieve word identifiers. Aborting back to text.
15 19
errorColonTxmeditioncorpusidEditionidTextidWordidCalledWithNoArguments=** Error\: txmedition(corpusid, editionid?, textid?, wordid?) called with no arguments
20
EditionLink_1=txmedition() called: 
21
ErrorCorpusHasNoDefaultEdition=Error: corpus has no default edition.
22
ErrorCorpusHasNoText=Error: corpus has no text.
23
ErrorCorpusHasNoTextWithIDP0=Error: corpus has no text with id={0}
24
ErrorNoCorpusWithIDP0=Error: no corpus with ID=
25
ErrorNoP0TextInTheP1Corpus=Error: No {0} text in the {1} corpus
26
ErrorNoTextAvailableInTheP0Corpus=Error: No text available in the {0} corpus
27
ErrorNoTextFoundwithIDP0=** Error: not text found with ID=
28
ErrorNoTextFoundWiththeP0Id=** Error: no text found with ID=
29
ErrorNoTextFoundWithTheP0Id=** Error: no text found with id=
30
ErrorP0=Error: 
31
ErrorP0IsNotReadyToUse=Error: {0}  is not ready to use
16 32
errorWhileGettingAvailableEditionsColonP0=** Error while retrieving available editions\: {0}
17 33
errorWhileOpeningEditionColonP0=** Error while opening edition\: {0}
18 34
errorWhileOpeningEditorColonP0=** Error while opening edition\: {0}
......
20 36
firstPageOfTheText=First page of the text
21 37
firstTextOfTheCorpus=First text of the corpus
22 38
forward=Forward
39
InitialZoom=Zoom initial
23 40
lastPageOfTheText=Last page of the text
24 41
lastTextOfTheCorpus=Last text of the corpus
42
LinkedEditorOpeningPosition=Linked editor position
25 43
nextPage=Next page
26 44
nextText=Next text
27 45
noEditionFound=Edition not found
28 46
noEditionFoundForTextEqualsP0AndEditionEqualsP1=No ''{0}'' edition found for text ''{1}''.
29 47
noEditionToOpen=No edition available.
30 48
noEditionWithNameEqualsP0AvailableForTextEqualsP1=No ''{0}'' edition found for text ''{1}''.
49
NoHits=No hit.
50
OpeningConcordancesOfQueryP0=Opening concordances with query=
31 51
openingDefaultEditionsColonP0=Opening [{0}] edition...
32 52
openingWithFirstEditionNoDefaultEditionSetColonP0=Opening [{0}] edition (no default edition).
53
P0Hits={0} hits.
33 54
page=Page
34 55
pageButtons=page buttons
35 56
pageNotFoundP0=Page ''{0}'' not found.
......
37 58
previousText=Previous text
38 59
reload=Reload
39 60
sCRIPTRETURNEDEqualsP0=Script returned ''{0}''
61
Search=Search...
62
SearchingForP0InTheP1Corpus=Searching for <{0}> in the {1} corpus...
40 63
selectOneOrMoreEditions=Select one or more editions.
41 64
text=Text
42 65
textButtons=text browsing buttons
66
TXMCouldNotOpenTheSWTInternalBrowser=TXM could not open the SWT internal browser: 
43 67
warningColonCouldNotFindEditionForNameEqualsP0=Warning\: could not retrieve edition ''{0}''
44 68
warningColonUnknownedParameterIdEqualsP0=Warning\: unknown parameter of identifier {0}.
69
WarningCorpusHasNoEditionNamedP0=Warning: corpus has no edition named {0}
70
WarningFoundMoreThanOneWordForIdP0InTheP1Text=Warning: found more than one word for id={0} in {1}
71
WarningNoWordFoundForIdPOInTheP1Text=Warning: found no word for id={0} in {1}
72
ZoomIn=Zoom avant
73
ZoomOut=Zoom arrière
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SearchEditionToolbar.java (revision 3837)
13 13
import org.eclipse.swt.widgets.Composite;
14 14
import org.txm.concordance.rcp.handlers.ComputeConcordance;
15 15
import org.txm.edition.rcp.handlers.BackToText;
16
import org.txm.edition.rcp.messages.EditionUIMessages;
16 17
import org.txm.objects.Match;
17 18
import org.txm.rcp.IImageKeys;
18 19
import org.txm.rcp.swt.widget.AssistedChoiceQueryWidget;
......
196 197
	}
197 198

  
198 199
	protected void openConcordance() {
199
		System.out.println("Opening concordances with query="+this.searchText.getQuery());
200
		System.out.println(EditionUIMessages.OpeningConcordancesOfQueryP0+this.searchText.getQuery());
200 201
	}
201 202

  
202 203
	protected void closeSearch() {
......
238 239
	}
239 240
	
240 241
	protected void search() {
241
		Log.info(NLS.bind("Searching for <{0}> in the {1} corpus...", searchText.getQuery(), mcorpus.getName()));
242
		Log.info(NLS.bind(EditionUIMessages.SearchingForP0InTheP1Corpus, searchText.getQuery(), mcorpus.getName()));
242 243
		IQuery q = searchText.getQuery();
243 244
		try {
244
			Selection tmp = searchText.getQuery().getSearchEngine().query(mcorpus, q, "SEARCH", false);
245
			Selection tmp = searchText.getQuery().getSearchEngine().query(mcorpus, q, "SEARCH", false); //$NON-NLS-1$
245 246
			if (tmp.getNMatch() > 0) {
246 247
				searchResult = tmp;
247 248
				
......
251 252
				String wordid = editor.getEditionPanel(0).getCurrentPage().getWordId();
252 253
				String text = editor.getEditionPanel(0).getCurrentPage().getEdition().getText().getName();
253 254
				if (wordid != null && text != null) {
254
					QueryResult rez2 = mcorpus.query(new CQLQuery("[_.text_id=\"" + text + "\" & id=\"" + wordid + "\"]"), "SEARCHINIT", false);
255
					QueryResult rez2 = mcorpus.query(new CQLQuery("[_.text_id=\"" + text + "\" & id=\"" + wordid + "\"]"), "SEARCHINIT", false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
255 256
					if (rez2.getNMatch() > 0) {
256 257
						int p = rez2.getMatch(0).getStart();
257 258
						List<? extends Match> matches = searchResult.getMatches();
......
271 272
				searchNavigation.refresh();
272 273
				searchText.setFocus();
273 274
				showCurrentSearchMatch();
274
				Log.info("" + searchResult.getNMatch() + " hits.");
275
				Log.info(EditionUIMessages.P0Hits + searchResult.getNMatch() + " hits."); //$NON-NLS-2$ //$NON-NLS-1$
275 276
			}
276 277
			else {
277 278
				searchIndex = 0;
......
281 282
				searchNavigation.setMinPosition(0);
282 283
				searchNavigation.setMaxPosition(0);
283 284
				searchNavigation.refresh();
284
				Log.info("No hit.");
285
				Log.info(EditionUIMessages.NoHits);
285 286
			}
286 287
		}
287 288
		catch (Exception e1) {
......
299 300
					editor.updateWordStyles();
300 301
				}
301 302
				Match match = searchResult.getMatches().get(searchIndex);
302
				String text = CQPSearchEngine.getEngine().getValueForProperty(match, mcorpus.getStructuralUnitProperty("text_id"));
303
				String text = CQPSearchEngine.getEngine().getValueForProperty(match, mcorpus.getStructuralUnitProperty("text_id")); //$NON-NLS-1$
303 304
				int[] positions = MatchUtils.toPositions(match);
304
				foundWordids = CQPSearchEngine.getEngine().getValuesForProperty(positions, mcorpus.getProperty("id"));
305
				foundWordids = CQPSearchEngine.getEngine().getValuesForProperty(positions, mcorpus.getProperty("id")); //$NON-NLS-1$
305 306
				if (foundWordids.size() == 0) return;
306 307
				
307 308
				editor.backToText(editor.getResult().getProject().getText(text), foundWordids.get(0));
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionLink.java (revision 3837)
26 26
	
27 27
	TXMEditor<? extends TXMResult> synopticEditionEditor;
28 28
	
29
	public static final String FCT = "txmedition";
29
	public static final String FCT = "txmedition"; //$NON-NLS-1$
30 30
		
31 31
	EditionLink(TXMEditor<? extends TXMResult> synopticEditionEditor, Browser browser) {
32 32
		super(browser, FCT); //$NON-NLS-1$
......
37 37
	@Override
38 38
	public Object function(Object[] arguments) { // corpus id, edition id, text id, word id
39 39
		
40
		Log.finer("txmedition() called: "+Arrays.toString(arguments));
40
		Log.finer(EditionUIMessages.EditionLink_1+Arrays.toString(arguments));
41 41
		
42 42
		HashMap<String, String> params = new HashMap<>();
43 43
		
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java (revision 3837)
291 291
		}
292 292
		catch (Exception e) {
293 293
			String error = e.getMessage();
294
			Log.severe("Browser evaluate error: " + e);
294
			Log.severe(EditionUIMessages.BrowserEvaluateErrorP0 + e);
295 295
			Log.printStackTrace(e);
296 296
		}
297 297
		return null;
......
305 305
			return getBrowser().execute(code);
306 306
		}
307 307
		catch (Throwable e) {
308
			Log.severe("Browser execute error: " + e);
308
			Log.severe(EditionUIMessages.BrowserExecuteErrorP0 + e);
309 309
			Log.printStackTrace(e);
310 310
		}
311 311
		return false;
......
324 324
			Bundle bundle = Platform.getBundle("org.txm.edition.rcp"); //$NON-NLS-1$
325 325
			URL fileURL = bundle.getEntry("res/js/functions.js"); //$NON-NLS-1$
326 326
			URL r = FileLocator.resolve(fileURL);
327
			Log.fine("Load JS functions from: " + r);
327
			Log.fine("Load JS functions from: " + r); //$NON-NLS-1$
328 328
			functions = IOUtils.getText(r, "UTF-8"); //$NON-NLS-1$
329 329
		}
330 330
		catch (Exception e) {
......
397 397
			public synchronized void completed(ProgressEvent event) {
398 398

  
399 399
				Browser browser = getBrowser();
400
				Object o = browser.evaluate("return typeof " + CommandLink.FCT + ";");
401
				if ("undefined".equals(o)) {
400
				Object o = browser.evaluate("return typeof " + CommandLink.FCT + ";"); //$NON-NLS-1$ //$NON-NLS-2$
401
				if ("undefined".equals(o)) { //$NON-NLS-1$
402 402
					if (cmdLink != null) {
403 403
						cmdLink.dispose();
404 404
					}
405 405
					cmdLink = new CommandLink(synopticEditionEditor, browser);
406 406
					//System.out.println("rebuild cmdLink");
407 407
				}
408
				o = browser.evaluate("return typeof " + EditionLink.FCT + ";");
409
				if ("undefined".equals(o)) {
408
				o = browser.evaluate("return typeof " + EditionLink.FCT + ";"); //$NON-NLS-1$ //$NON-NLS-2$
409
				if ("undefined".equals(o)) { //$NON-NLS-1$
410 410
					if (editionLink != null) {
411 411
						editionLink.dispose();
412 412
					}
......
419 419
				Object rez = evaluate("return typeof sheet;"); //$NON-NLS-1$
420 420
				if ("undefined".equals(rez)) { //$NON-NLS-1$
421 421
					Object loadResult = evaluate(functions);
422
					Object testloadResult = evaluate("return typeof txmGetSelection;");
423
					if (loadResult == null || testloadResult == null || "undefined".equals(testloadResult.toString())) { // build the sheet if not present in the HTML DOM
422
					Object testloadResult = evaluate("return typeof txmGetSelection;"); //$NON-NLS-1$
423
					if (loadResult == null || testloadResult == null || "undefined".equals(testloadResult.toString())) { // build the sheet if not present in the HTML DOM //$NON-NLS-1$
424 424
						Log.severe("JS execution (init) error with=" + functions); //$NON-NLS-1$
425 425
					}
426 426
					else {
427
						Log.finer("JS functions loaded.");
427
						Log.finer("JS functions loaded."); //$NON-NLS-1$
428 428
					}
429 429
				}
430 430

  
......
447 447

  
448 448
				if (buffer.length() > 0) {
449 449
					if (!execute(buffer.toString())) {
450
						Log.fine("JS execution error (delete cssRules) with=" + buffer);
450
						Log.fine("JS execution error (delete cssRules) with=" + buffer); //$NON-NLS-1$
451 451
					}
452 452
				}
453 453

  
454 454

  
455 455
				buffer = new StringBuilder();
456
				Log.finest("EditionPanel " + currentEdition + " reload " + currentPage);
456
				Log.finest("EditionPanel " + currentEdition + " reload " + currentPage); //$NON-NLS-1$ //$NON-NLS-2$
457 457
				if (currentPage != null && currentEdition != null) { // avoid null pointer
458 458

  
459 459
					String firstWord = currentPage.getWordId();
......
461 461
					String lastWord = "w_999999999"; //$NON-NLS-1$
462 462
					while (nextPage != null && currentPage != nextPage) {
463 463
						lastWord = nextPage.getWordId();
464
						if (!("w_0".equals(lastWord))) { // this is a word id
464
						if (!("w_0".equals(lastWord))) { // this is a word id //$NON-NLS-1$
465 465
							break; // ok
466 466
						}
467 467
						Page p = currentEdition.getNextPage(nextPage);
468 468
						if (p == nextPage) { // end of pages
469
							lastWord = "w_999999999";
469
							lastWord = "w_999999999"; //$NON-NLS-1$
470 470
							break;
471 471
						}
472 472
						nextPage = p;
......
521 521

  
522 522
				if (buffer.length() > 0) {
523 523
					if (!execute(buffer.toString())) {
524
						Log.fine("JS execution (highlight) error with=" + buffer);
524
						Log.fine("JS execution (highlight) error with=" + buffer); //$NON-NLS-1$
525 525
					}
526 526
				}
527 527

  
......
569 569

  
570 570
				if (buffer.length() > 0) {
571 571
					if (!execute(buffer.toString())) {
572
						Log.fine("JS execution (color) error with=" + buffer);
572
						Log.fine("JS execution (color) error with=" + buffer); //$NON-NLS-1$
573 573
					}
574 574
				}
575 575

  
......
614 614

  
615 615
				if (buffer.length() > 0) {
616 616
					if (!execute(buffer.toString())) {
617
						Log.fine("JS execution (font) error with=" + buffer);
617
						Log.fine("JS execution (font) error with=" + buffer); //$NON-NLS-1$
618 618
					}
619 619
				}
620 620

  
......
634 634
						focusedWordID = null; // focus one time
635 635
					}
636 636
					else {
637
						Log.fine("JS execution (focus) error with script=" + buffer);
637
						Log.fine("JS execution (focus) error with script=" + buffer); //$NON-NLS-1$
638 638
					}
639 639
				}
640 640

  
......
652 652
				// System.out.println(buffer);
653 653
				if (buffer.length() > 0) {
654 654
					if (!execute(buffer.toString())) {
655
						Log.fine("JS execution (area focus) error with=" + buffer);
655
						Log.fine("JS execution (area focus) error with=" + buffer); //$NON-NLS-1$
656 656
					}
657 657
				}
658 658
				// System.out.println("n="+n+" time="+(System.currentTimeMillis()-start));
......
899 899
		// page_label.setText(makePageLabel());
900 900
	}
901 901

  
902
	public static String fromEncodeString = "\"-&-'-<->-`- -¡-¢-£-¥-§-©-«-®-°-±-´-µ-¶-·-»-¿-À-Á-Â-Ã-Ä-Æ-Ç-È-É-Ê-Ë-Ì-Í-Î-Ï-Ñ-Ò-Ó-Ô-Õ-Ö-Ø-Ù-Ú-Û-Ü-ß-à-á-â-ã-ä-å-æ-ç-è-é-ê-ë-ì-í-î-ï-ð-ñ-ò-ó-ô-õ-ö-÷-ø-ù-ú-û-ü-ý-ÿ-Ā-ā-ĉ-Č-č-ē-ĝ-ģ-ĥ-Ī-ī-ĵ-ő-œ-ŕ-ř-ŝ-Š-š-Ū-ū-ŭ-ű-ŵ-ŷ-π-ḧ-ẅ-ẍ-ẑ-ỳ- - -–-—-‘-’-•-′-″-€-™-←-↑-→-↓-↖-↗-↘-↙-⌘-⏏-☑-✔";
903
	public static String toEncodeString = "%22-%26-%27-%3C-%3E-%60-%C2%A0-%C2%A1-%C2%A2-%C2%A3-%C2%A5-%C2%A7-%C2%A9-%C2%AB-%C2%AE-%C2%B0-%C2%B1-%C2%B4-%C2%B5-%C2%B6-%C2%B7-%C2%BB-%C2%BF-%C3%80-%C3%81-%C3%82-%C3%83-%C3%84-%C3%86-%C3%87-%C3%88-%C3%89-%C3%8A-%C3%8B-%C3%8C-%C3%8D-%C3%8E-%C3%8F-%C3%91-%C3%92-%C3%93-%C3%94-%C3%95-%C3%96-%C3%98-%C3%99-%C3%9A-%C3%9B-%C3%9C-%C3%9F-%C3%A0-%C3%A1-%C3%A2-%C3%A3-%C3%A4-%C3%A5-%C3%A6-%C3%A7-%C3%A8-%C3%A9-%C3%AA-%C3%AB-%C3%AC-%C3%AD-%C3%AE-%C3%AF-%C3%B0-%C3%B1-%C3%B2-%C3%B3-%C3%B4-%C3%B5-%C3%B6-%C3%B7-%C3%B8-%C3%B9-%C3%BA-%C3%BB-%C3%BC-%C3%BD-%C3%BF-%C4%80-%C4%81-%C4%89-%C4%8C-%C4%8D-%C4%93-%C4%9D-%C4%A3-%C4%A5-%C4%AA-%C4%AB-%C4%B5-%C5%91-%C5%93-%C5%95-%C5%99-%C5%9D-%C5%A0-%C5%A1-%C5%AA-%C5%AB-%C5%AD-%C5%B1-%C5%B5-%C5%B7-%CF%80-%E1%B8%A7-%E1%BA%85-%E1%BA%8D-%E1%BA%91-%E1%BB%B3-%E2%80%82-%E2%80%83-%E2%80%93-%E2%80%94-%E2%80%98-%E2%80%99-%E2%80%A2-%E2%80%B2-%E2%80%B3-%E2%82%AC-%E2%84%A2-%E2%86%90-%E2%86%91-%E2%86%92-%E2%86%93-%E2%86%96-%E2%86%97-%E2%86%98-%E2%86%99-%E2%8C%98-%E2%8F%8F-%E2%98%91-%E2%9C%94";
902
	public static String fromEncodeString = "\"-&-'-<->-`- -¡-¢-£-¥-§-©-«-®-°-±-´-µ-¶-·-»-¿-À-Á-Â-Ã-Ä-Æ-Ç-È-É-Ê-Ë-Ì-Í-Î-Ï-Ñ-Ò-Ó-Ô-Õ-Ö-Ø-Ù-Ú-Û-Ü-ß-à-á-â-ã-ä-å-æ-ç-è-é-ê-ë-ì-í-î-ï-ð-ñ-ò-ó-ô-õ-ö-÷-ø-ù-ú-û-ü-ý-ÿ-Ā-ā-ĉ-Č-č-ē-ĝ-ģ-ĥ-Ī-ī-ĵ-ő-œ-ŕ-ř-ŝ-Š-š-Ū-ū-ŭ-ű-ŵ-ŷ-π-ḧ-ẅ-ẍ-ẑ-ỳ- - -–-—-‘-’-•-′-″-€-™-←-↑-→-↓-↖-↗-↘-↙-⌘-⏏-☑-✔"; //$NON-NLS-1$
903
	public static String toEncodeString = "%22-%26-%27-%3C-%3E-%60-%C2%A0-%C2%A1-%C2%A2-%C2%A3-%C2%A5-%C2%A7-%C2%A9-%C2%AB-%C2%AE-%C2%B0-%C2%B1-%C2%B4-%C2%B5-%C2%B6-%C2%B7-%C2%BB-%C2%BF-%C3%80-%C3%81-%C3%82-%C3%83-%C3%84-%C3%86-%C3%87-%C3%88-%C3%89-%C3%8A-%C3%8B-%C3%8C-%C3%8D-%C3%8E-%C3%8F-%C3%91-%C3%92-%C3%93-%C3%94-%C3%95-%C3%96-%C3%98-%C3%99-%C3%9A-%C3%9B-%C3%9C-%C3%9F-%C3%A0-%C3%A1-%C3%A2-%C3%A3-%C3%A4-%C3%A5-%C3%A6-%C3%A7-%C3%A8-%C3%A9-%C3%AA-%C3%AB-%C3%AC-%C3%AD-%C3%AE-%C3%AF-%C3%B0-%C3%B1-%C3%B2-%C3%B3-%C3%B4-%C3%B5-%C3%B6-%C3%B7-%C3%B8-%C3%B9-%C3%BA-%C3%BB-%C3%BC-%C3%BD-%C3%BF-%C4%80-%C4%81-%C4%89-%C4%8C-%C4%8D-%C4%93-%C4%9D-%C4%A3-%C4%A5-%C4%AA-%C4%AB-%C4%B5-%C5%91-%C5%93-%C5%95-%C5%99-%C5%9D-%C5%A0-%C5%A1-%C5%AA-%C5%AB-%C5%AD-%C5%B1-%C5%B5-%C5%B7-%CF%80-%E1%B8%A7-%E1%BA%85-%E1%BA%8D-%E1%BA%91-%E1%BB%B3-%E2%80%82-%E2%80%83-%E2%80%93-%E2%80%94-%E2%80%98-%E2%80%99-%E2%80%A2-%E2%80%B2-%E2%80%B3-%E2%82%AC-%E2%84%A2-%E2%86%90-%E2%86%91-%E2%86%92-%E2%86%93-%E2%86%96-%E2%86%97-%E2%86%98-%E2%86%99-%E2%8C%98-%E2%8F%8F-%E2%98%91-%E2%9C%94"; //$NON-NLS-1$
904 904
	private static String[] fromEncode, toEncode;
905 905
	static { // GTK webkit URL encoding differs from Java File.toURI() encoding
906
		if ("gtk".equals(System.getProperty("osgi.ws"))) {
907
			fromEncode = fromEncodeString.split("-");
908
			toEncode = toEncodeString.split("-");
906
		if ("gtk".equals(System.getProperty("osgi.ws"))) { //$NON-NLS-1$ //$NON-NLS-2$
907
			fromEncode = fromEncodeString.split("-"); //$NON-NLS-1$
908
			toEncode = toEncodeString.split("-"); //$NON-NLS-1$
909 909
		}
910 910
	}
911 911
	
......
1301 1301
					"container.appendChild(sel.getRangeAt(i).cloneContents());" + //$NON-NLS-1$
1302 1302
					"}" + //$NON-NLS-1$
1303 1303
					"html = container.innerHTML;" + //$NON-NLS-1$
1304
					"container = null;" +
1304
					"container = null;" + //$NON-NLS-1$
1305 1305
					//"container.parentNode.removeChild(container);" +
1306 1306
					"}" + //$NON-NLS-1$
1307 1307
					"} else if (typeof document.selection != \"undefined\") {" + // for IE < 11 //$NON-NLS-1$
......
1314 1314
	public String getTextSelectionDOM() {
1315 1315

  
1316 1316
		String t = ((String) evaluate(SCRIPT01));
1317
		Log.finest("HTML text selection=" + t);
1317
		Log.finest("HTML text selection=" + t); //$NON-NLS-1$
1318 1318
		return t;
1319 1319
	}
1320 1320

  
......
1394 1394

  
1395 1395
		// System.out.println("DOM="+getTextSelectionDOM());
1396 1396
		String dom = getTextSelectionDOM();
1397
		if (dom == null) return "";
1397
		if (dom == null) return ""; //$NON-NLS-1$
1398 1398

  
1399 1399
		String rez = dom.replaceAll("<[^>]+>", ""); //$NON-NLS-1$ //$NON-NLS-2$
1400 1400
		// System.out.println("STR="+rez);
......
1465 1465
				new MenuItem(menu, SWT.SEPARATOR);
1466 1466

  
1467 1467
				MenuItem searchItem = new MenuItem(menu, SWT.NONE);
1468
				searchItem.setText("Search...");
1468
				searchItem.setText(EditionUIMessages.Search);
1469 1469
				searchItem.addSelectionListener(new SelectionListener() {
1470 1470

  
1471 1471
					@Override
......
1499 1499
				copyItem.setEnabled(text != null && text.length() > 0);
1500 1500

  
1501 1501
				MenuItem zoomInItem = new MenuItem(menu, SWT.NONE);
1502
				zoomInItem.setText("Zoom avant");
1502
				zoomInItem.setText(EditionUIMessages.ZoomIn);
1503 1503
				zoomInItem.addSelectionListener(new SelectionListener() {
1504 1504

  
1505 1505
					@Override
......
1512 1512
				});
1513 1513

  
1514 1514
				MenuItem zoomOutItem = new MenuItem(menu, SWT.NONE);
1515
				zoomOutItem.setText("Zoom arrière");
1515
				zoomOutItem.setText(EditionUIMessages.ZoomOut);
1516 1516
				zoomOutItem.addSelectionListener(new SelectionListener() {
1517 1517

  
1518 1518
					@Override
......
1526 1526
				});
1527 1527

  
1528 1528
				MenuItem zoomResetItem = new MenuItem(menu, SWT.NONE);
1529
				zoomResetItem.setText("Zoom initial");
1529
				zoomResetItem.setText(EditionUIMessages.InitialZoom);
1530 1530
				zoomResetItem.addSelectionListener(new SelectionListener() {
1531 1531

  
1532 1532
					@Override
......
1699 1699

  
1700 1700
	public void setHighlightedArea(HashSet<int[]> positions) {
1701 1701

  
1702
		Log.finer("Highlight area: not implemented");
1702
		Log.finer("Highlight area: not implemented"); //$NON-NLS-1$
1703 1703
	}
1704 1704

  
1705 1705
	public void expandSelectionTo(String[] ids) {
......
1715 1715
		String id1 = ids[0];
1716 1716
		String id2 = ids[1];
1717 1717
		if (id2 == null) id2 = id1;
1718
		String SCRIPT02_expand = ""
1718
		String SCRIPT02_expand = "" //$NON-NLS-1$
1719 1719
				+ "var elt = document.getElementById(\"" + id1 + "\");\n" //$NON-NLS-1$ //$NON-NLS-2$
1720 1720
				+ "var elt2 = document.getElementById(\"" + id2 + "\");\n" //$NON-NLS-1$ //$NON-NLS-2$
1721 1721
				// + "alert(\"elt=\"+elt);\n"
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/RGBA.java (revision 3837)
15 15
	}
16 16
	
17 17
	public RGBA(String rgbOrrgba) {
18
		if (rgbOrrgba.startsWith("#")) {
18
		if (rgbOrrgba.startsWith("#")) { //$NON-NLS-1$
19 19
			
20 20
			Color c = HexToColor(rgbOrrgba);
21 21
			
......
47 47
	 */
48 48
	public static Color HexToColor(String hex) 
49 49
	{
50
	    hex = hex.replace("#", "");
50
	    hex = hex.replace("#", ""); //$NON-NLS-1$ //$NON-NLS-2$
51 51
	    switch (hex.length()) {
52 52
	        case 6:
53 53
	            return new Color(
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java (revision 3837)
324 324
	public void goToText(String textId) {
325 325
		Text newText = this.project.getText(textId);
326 326
		if (newText == null) {
327
			Log.warning("** Error: not text found with ID="+textId);
327
			Log.warning(EditionUIMessages.ErrorNoTextFoundwithIDP0+textId);
328 328
			return;
329 329
		} else {
330 330
			setText(newText, true);
......
855 855
						editionPanels.put(editionName, panel);
856 856
					}
857 857
					catch (SWTError e) {
858
						Log.severe("TXM could not open the internal browser: " + e);
858
						Log.severe(EditionUIMessages.TXMCouldNotOpenTheSWTInternalBrowser + e);
859 859
						Log.printStackTrace(e);
860 860
					}
861 861
				}
......
872 872
		}
873 873
		text = this.corpus.getProject().getText(textId);
874 874
		if (text == null) {
875
			Log.warning("** Error: no text found with id="+textId);
875
			Log.warning(EditionUIMessages.ErrorNoTextFoundWithTheP0Id+textId);
876 876
			return false;
877 877
		}
878 878
		try {
......
880 880
			setText(text,  false);
881 881
		}
882 882
		catch (Exception e) {
883
			System.out.println("Error: " + text.getName() + " is not ready to use");
883
			System.out.println(EditionUIMessages.ErrorP0IsNotReadyToUse + text.getName() + " is not ready to use"); //$NON-NLS-2$ //$NON-NLS-1$
884 884
			return false;
885 885
		}
886 886
		
......
890 890
		
891 891
		if (wordIds != null && wordIds.length() > 0) {
892 892
			
893
			String[] wordIdsArray = wordIds.split(",");
893
			String[] wordIdsArray = wordIds.split(","); //$NON-NLS-1$
894 894
			
895 895
			if (pageId == null) {
896 896
				this.goToWord(textId, wordIdsArray[0]);
......
900 900
		}
901 901
		
902 902
		String url = this.editionPanels.get(editionNames.get(0)).getURL();
903
		if (url == null || url.equals("about:blank")) {
903
		if (url == null || url.equals("about:blank")) { //$NON-NLS-1$
904 904
			setText(text,  true);
905 905
		}
906 906
		return true;
......
924 924
		
925 925
		Text text = this.corpus.getProject().getText(textId);
926 926
		if (text == null) {
927
			Log.warning("** Error: no text found with ID="+textId);
927
			Log.warning(EditionUIMessages.ErrorNoTextFoundWiththeP0Id+textId);
928 928
			return false;
929 929
		}
930 930
		
TXM/trunk/bundles/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditorInput.java (revision 3837)
38 38
		this.wordId = wordIds;
39 39
		
40 40
		if (editions == null) {
41
			String[] defaultEditions = corpus.getProject().getDefaultEditionName().split(",");
41
			String[] defaultEditions = corpus.getProject().getDefaultEditionName().split(","); //$NON-NLS-1$
42 42
			this.editions = Arrays.asList(defaultEditions);
43 43
		}
44 44
	}

Formats disponibles : Unified diff