Revision 1581

tmp/org.txm.tigersearch.rcp/src/org/txm/function/tigersearch/TIGERSearch.java (revision 1581)
280 280
	}
281 281
	
282 282
	@Override
283
	public String getResultype() {
283
	public String getResulType() {
284 284
		return "Tiger search";
285 285
	}
286 286

  
tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java (revision 1581)
417 417
	}
418 418
	
419 419
	@Override
420
	public String getResultype() {
420
	public String getResulType() {
421 421
		// TODO
422 422
		return this.getClass().getSimpleName();
423 423
	}
tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ContextSubcorpus.java (revision 1581)
172 172
	}
173 173

  
174 174
	@Override
175
	public String getResultype() {
175
	public String getResulType() {
176 176
		// TODO
177 177
		return this.getClass().getSimpleName();
178 178
	}
tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ValuesOfQuery.java (revision 1581)
231 231
	}
232 232
	
233 233
	@Override
234
	public String getResultype() {
234
	public String getResulType() {
235 235
		// TODO
236 236
		return this.getClass().getSimpleName();
237 237
	}
tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java (revision 1581)
714 714
	}
715 715
	
716 716
	@Override
717
	public String getResultype() {
717
	public String getResulType() {
718 718
		// TODO
719 719
		return this.getClass().getSimpleName();
720 720
	}
tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java (revision 1581)
238 238
	}
239 239

  
240 240
	@Override
241
	public String getResultype() {
241
	public String getResulType() {
242 242
		return PartitionCoreMessages.RESULT_TYPE;
243 243
	}
244 244

  
tmp/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java (revision 1581)
757 757
	}
758 758

  
759 759
	@Override
760
	public String getResultype() {
760
	public String getResulType() {
761 761
		return ReferencerCoreMessages.RESULT_TYPE;
762 762
	}
763 763

  
tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/functions/WordCloud.java (revision 1581)
370 370
	}
371 371

  
372 372
	@Override
373
	public String getResultype() {
373
	public String getResulType() {
374 374
		return WordCloudCoreMessages.RESULT_TYPE;
375 375
	}
376 376
}
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java (revision 1581)
1600 1600

  
1601 1601

  
1602 1602
	@Override
1603
	public String getResultype() {
1603
	public String getResulType() {
1604 1604
		return CooccurrenceCoreMessages.RESULT_TYPE;
1605 1605
	}
1606 1606

  
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1581)
2331 2331
	 * Checks if the result must be persisted according to the persistence global preference or the user persistable state.
2332 2332
	 * @return
2333 2333
	 */
2334
	//	public boolean mustBePersisted()	{
2335
	//		if (this.internalPersistable
2336
	//				|| this.userPersistable)	{
2337
	//			return true;
2338
	//		}
2339
	//		return false;
2340
	//	}
2341

  
2342
	// FIXME: need to prove this code
2343 2334
	public boolean mustBePersisted()	{
2344 2335
		return this.internalPersistable || this.userPersistable;
2345 2336
	}
......
2490 2481
	 * This method can also be used to sort the result by type (alphanumeric order).
2491 2482
	 * @return
2492 2483
	 */
2493
	public abstract String getResultype();
2484
	public abstract String getResulType();
2494 2485

  
2495 2486

  
2496 2487
	@Override
tmp/org.txm.core/src/java/org/txm/objects/Workspace.java (revision 1581)
371 371
	}
372 372

  
373 373
	@Override
374
	public String getResultype() {
374
	public String getResulType() {
375 375
		return "Workspace";
376 376
	}
377 377

  
tmp/org.txm.core/src/java/org/txm/objects/Project.java (revision 1581)
906 906
	}
907 907

  
908 908
	@Override
909
	public String getResultype() {
909
	public String getResulType() {
910 910
		return "Project";
911 911
	}
912 912

  
tmp/org.txm.core/src/java/org/txm/objects/Text.java (revision 1581)
294 294
	}
295 295

  
296 296
	@Override
297
	public String getResultype() {
297
	public String getResulType() {
298 298
		return "Text";
299 299
	}
300 300
	
tmp/org.txm.core/src/java/org/txm/objects/SavedQuery.java (revision 1581)
173 173
	}
174 174

  
175 175
	@Override
176
	public String getResultype() {
176
	public String getResulType() {
177 177
		return "SavedQuery";
178 178
	}
179 179

  
tmp/org.txm.core/src/java/org/txm/objects/Edition.java (revision 1581)
425 425
	}
426 426

  
427 427
	@Override
428
	public String getResultype() {
428
	public String getResulType() {
429 429
		return "Edition";
430 430
	}
431 431

  
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 1581)
276 276
		boolean needInit = (this.chartComposite.getChartComponent() == null) && (this.getResult().getChart() != null);
277 277
		
278 278
		// loading chart
279
		this.getResult().subTask(TXMCoreMessages.bind("Loading chart of type {0}.", this.getResult().getResultype())); //$NON-NLS-1$
279
		this.getResult().subTask(TXMCoreMessages.bind("Loading chart of type {0}.", this.getResult().getResulType())); //$NON-NLS-1$
280 280
		this.loadChart();
281 281
		
282 282
		
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/summary/Summary.java (revision 1581)
302 302
	
303 303
	
304 304
	@Override
305
	public String getResultype() {
305
	public String getResulType() {
306 306
		return "Summary";
307 307
	}
308 308
}
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/preview/Preview.java (revision 1581)
127 127
	}
128 128

  
129 129
	@Override
130
	public String getResultype() {
130
	public String getResulType() {
131 131
		return "Preview";
132 132
	}
133 133
}
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java (revision 1581)
527 527
	}
528 528

  
529 529
	@Override
530
	public String getResultype() {
530
	public String getResulType() {
531 531
		return "Selection";
532 532
	}
533 533
}
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/MainCorpus.java (revision 1581)
660 660
	}
661 661

  
662 662
	@Override
663
	public String getResultype() {
663
	public String getResulType() {
664 664
		return "Corpus";
665 665
	}
666 666

  
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Subcorpus.java (revision 1581)
560 560
	}
561 561

  
562 562
	@Override
563
	public String getResultype() {
563
	public String getResulType() {
564 564
		return "Corpus";
565 565
	}
566 566

  
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Part.java (revision 1581)
158 158
	}
159 159

  
160 160
	@Override
161
	public String getResultype() {
161
	public String getResulType() {
162 162
		return "Part";
163 163
	}
164 164
}
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java (revision 1581)
706 706
	}
707 707

  
708 708
	@Override
709
	public String getResultype() {
709
	public String getResulType() {
710 710
		return "Partition";
711 711
	}
712 712

  
tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java (revision 1581)
1790 1790

  
1791 1791

  
1792 1792
	@Override
1793
	public String getResultype() {
1793
	public String getResulType() {
1794 1794
		return ConcordanceCoreMessages.RESULT_TYPE;
1795 1795
	}
1796 1796
}
tmp/org.txm.querycooccurrences.rcp/src/org/txm/functions/coocmatrix/QueryCooccurrence.java (revision 1581)
227 227

  
228 228
	@Override
229 229
	public String getDetails() {
230
		return getResultype()+" d=" + dist + " min=" + minCooc+" Q1="+queries1.toString()+ " Q2="+queries2.toString();
230
		return getResulType()+" d=" + dist + " min=" + minCooc+" Q1="+queries1.toString()+ " Q2="+queries2.toString();
231 231
	}
232 232

  
233 233
	@Override
......
283 283
	}
284 284

  
285 285
	@Override
286
	public String getResultype() {
286
	public String getResulType() {
287 287
		return "Query cooccurrence";
288 288
	}
289 289

  
tmp/org.txm.querycooccurrences.rcp/src/org/txm/functions/coocmatrix/QueryAutoCooccurrence.java (revision 1581)
336 336
	}
337 337

  
338 338
	@Override
339
	public String getResultype() {
339
	public String getResulType() {
340 340
		return "Query auto cooccurrence";
341 341
	}
342 342

  
tmp/org.txm.ca.core/src/org/txm/ca/core/functions/CA.java (revision 1581)
973 973
	}
974 974
	
975 975
	@Override
976
	public String getResultype() {
976
	public String getResulType() {
977 977
		return CACoreMessages.RESULT_TYPE;
978 978
	}
979 979

  
tmp/org.txm.ca.core/src/org/txm/ca/core/functions/Eigenvalues.java (revision 1581)
110 110
	}
111 111

  
112 112
	@Override
113
	public String getResultype() {
113
	public String getResulType() {
114 114
		return CACoreMessages.eigenvalues;
115 115
	}
116 116

  
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/functions/LexicalTable.java (revision 1581)
662 662
	}
663 663

  
664 664
	@Override
665
	public String getResultype() {
665
	public String getResulType() {
666 666
		return LexicalTableCoreMessages.RESULT_TYPE;
667 667
	}
668 668

  
tmp/org.txm.ahc.core/src/org/txm/ahc/core/functions/AHC.java (revision 1581)
720 720
	}
721 721

  
722 722
	@Override
723
	public String getResultype() {
723
	public String getResulType() {
724 724
		return AHCCoreMessages.RESULT_TYPE;
725 725
	}
726 726

  
tmp/org.txm.index.core/src/org/txm/index/core/functions/___Lexicon2.java (revision 1581)
690 690

  
691 691

  
692 692
	@Override
693
	public String getResultype() {
693
	public String getResulType() {
694 694
		return IndexCoreMessages.lexicon;
695 695
	}
696 696

  
tmp/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java (revision 1581)
1148 1148
	}
1149 1149

  
1150 1150
	@Override
1151
	public String getResultype() {
1151
	public String getResulType() {
1152 1152
		return PartitionIndex.class.getSimpleName();
1153 1153
	}
1154 1154
}
tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java (revision 1581)
1106 1106
	}
1107 1107

  
1108 1108
	@Override
1109
	public String getResultype() {
1109
	public String getResulType() {
1110 1110
		return IndexCoreMessages.RESULT_TYPE;
1111 1111
	}
1112 1112
}
tmp/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java (revision 1581)
406 406
	}
407 407

  
408 408
	@Override
409
	public String getResultype() {
409
	public String getResulType() {
410 410
		return InternalViewCoreMessages.RESULT_TYPE;
411 411
	}
412 412

  
tmp/org.txm.textsbalance.core/src/org/txm/textsbalance/core/functions/TextsBalance.java (revision 1581)
428 428
	}
429 429

  
430 430
	@Override
431
	public String getResultype() {
431
	public String getResulType() {
432 432
		return "Texts balance";
433 433
	}
434 434

  
tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificities.java (revision 1581)
94 94
	/** The rownames. */
95 95
	private List<String> rownames = null;
96 96

  
97
	/** The name. */
98
	//private String name;
99

  
100 97
	/** The symbol. */
101 98
	private String symbol;
102 99

  
......
145 142
	@Override
146 143
	public boolean loadParameters() {
147 144
		this.lexicalTable = (LexicalTable) this.parent;
148

  
149
		//		CQPCorpus corpus = CQPCorpus.getFirstParentCorpus(this);
150
		//		this.corpus = corpus;
151
		//		if(corpus instanceof Subcorpus)	{
152
		//			this.subCorpus = corpus;
153
		//		}
154

  
155 145
		return true;
156 146
	}
157 147

  
......
174 164
			this.deleteChildren(SpecificitiesSelection.class);
175 165
		}
176 166

  
177
		//if (this.lexicalTable.hasBeenComputedOnce())	{ // LT should have been computed one because of TXMResult.compute
178

  
179 167
		ILexicalTable data = this.lexicalTable.getData();
180 168

  
181 169
		SpecificitiesR rSpecificities = new SpecificitiesR(data);
......
706 694
	}
707 695

  
708 696
	@Override
709
	public String getResultype() {
697
	public String getResulType() {
710 698
		return SpecificitiesCoreMessages.RESULT_TYPE;
711 699
	}
712 700

  
tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java (revision 1581)
143 143
	}
144 144

  
145 145
	@Override
146
	public String getResultype() {
146
	public String getResulType() {
147 147
		return SpecificitiesCoreMessages.specificitiesSelection;
148 148
	}
149 149

  
tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrast.java (revision 1581)
277 277
	}
278 278

  
279 279
	@Override
280
	public String getResultype() {
280
	public String getResulType() {
281 281
		// TODO; later we must implement this methods in subclasses
282 282
		return this.getClass().getSimpleName();
283 283
	}
tmp/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java (revision 1581)
600 600

  
601 601
	@Override
602 602
	public String getSimpleName() {
603
		return this.getResultype();
603
		return this.getResulType();
604 604
	}
605 605

  
606 606
	@Override
......
665 665
	}
666 666

  
667 667
	@Override
668
	public String getResultype() {
668
	public String getResulType() {
669 669
		return PropertiesCoreMessages.RESULT_TYPE;
670 670
	}
671 671
}
tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 1581)
854 854
	}
855 855

  
856 856
	@Override
857
	public String getResultype() {
857
	public String getResulType() {
858 858
		return ProgressionCoreMessages.RESULT_TYPE;
859 859
	}
860 860

  
tmp/org.txm.para.core/src/org/txm/para/core/functions/ParaBrowser.java (revision 1581)
297 297

  
298 298

  
299 299
	@Override
300
	public String getResultype() {
300
	public String getResulType() {
301 301
		return "Parallel browser";
302 302
	}
303 303
}
tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java (revision 1581)
458 458

  
459 459
	
460 460
	@Override
461
	public String getResultype() {
461
	public String getResulType() {
462 462
		return "Query index";
463 463
	}
464 464

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java (revision 1581)
24 24
	public static String enableAutomaticSaveOfAllResultsPersistence; 
25 25
	public static String showAllResultNodesInCorporaView; 
26 26

  
27

  
28 27
	
29 28
	
30

  
31

  
32

  
33

  
34

  
35

  
36

  
37

  
38

  
39

  
40

  
41

  
42

  
43

  
44 29
	
45 30
	
46
	
47
	
48
	
49
	
50
	
51
	
52
	
53
	
54
	
55
	
56
	
57
	
58
	
59
	
60
	
61
	
62
	
63
	
64
	
65
	
66
	
67
	
68
	
69
	
70
	
71
	
72
	
73
	
74
	
75
	
76
	
77
	
78
	
79
	
80
	
81
	
82 31
	public static String aboutTXM; 
83 32
	public static String warningColonTheCorpusP0IsCorruptedSomeCommandsWontWorkCorrectly; 
84 33
	public static String cannotReadTheFileP0; 
85 34
	public static String warning; 
86 35
	public static String warning_popup_allDescendantResultsWillBeUpdated;
36
	public static String warning_popup_editedResultsWillBelostP0;
87 37

  
88 38

  
89 39

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 1581)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)

2 2
#TXM messages generated by the PluginMessagesManager class
3 3
#Tue Dec 18 10:24:08 CET 2018
4 4

  
......
949 949
warningColonTheImportScriptIsMissingColonP0 = ** The {0} import script is unreachable.
950 950

  
951 951
warning_popup_allDescendantResultsWillBeUpdated                 = All descendant results will be updated. Do you want to continue?
952
warning_popup_editedResultsWillBelostP0                         = The following results have been manually edited:\n\n{0}\nThe modifications will be lost.\nDo you want to continue?
952 953
warning_popup_theP0HasBeenEditedItsChangesWillBeLost            = The {0} has been edited. Its changes will be lost. Do you want to continue?
953 954

  
954 955
withinAContextOf = within a context of
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 1581)
827 827

  
828 828
								// popup alert to inform user that the result has been manually edited
829 829
								if (TXMEditor.this.getResult().isAltered()
830
									&& !MessageDialog.openQuestion(getShell(), TXMCoreMessages.common_warning, TXMCoreMessages.bind(TXMUIMessages.warning_popup_theP0HasBeenEditedItsChangesWillBeLost, TXMEditor.this.getResult().getResultype()))) {
830
									&& !MessageDialog.openQuestion(getShell(), TXMCoreMessages.common_warning, TXMCoreMessages.bind(TXMUIMessages.warning_popup_theP0HasBeenEditedItsChangesWillBeLost, TXMEditor.this.getResult().getResulType()))) {
831 831
										setCanceled(true);
832 832
								}
833 833
								else	{
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 1581)
495 495
			ArrayList<String> bugs = new ArrayList<String>();
496 496
			for (TXMResult result : project.getDeepChildren()) {
497 497
				if (result.mustBePersisted() && result.isAltered()) {
498
					bugs.add(result.getSimpleName());
498
					bugs.add(result.getSimpleName() + " (" + result.getResulType() + ")");
499 499
				}
500 500
			}
501 501
			if (bugs.size() > 0) {
502
				messages.append("\t" + project.getName() + ": " + bugs + "\n\n");
502
				messages.append("\t" + project.getName() + ": " + bugs + "\n");
503 503
			}
504 504
		}
505 505

  
506 506
		if (messages.length() > 0) {
507
			return MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), TXMCoreMessages.common_warning, "Modified or not recomputed results won't be correctly saved. Continue?Lost data: \n"+messages);
507
			return MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), TXMCoreMessages.common_warning, NLS.bind(TXMUIMessages.warning_popup_editedResultsWillBelostP0, messages));
508 508
		}
509 509
		return true;
510 510
	}

Also available in: Unified diff