Révision 1612

tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 1612)
782 782
		int from = concordance.getTopIndex();
783 783
		from = Math.max(from, 0);
784 784

  
785
		int to = from + concordance.getNLinePerPage() - 1;
786
		to = Math.min(to, concordance.getNLines());
785
		int to = from + concordance.getNLinePerPage();
786
		to = Math.min(to, concordance.getNLines()) - 1;
787 787

  
788 788
		viewer.getControl().setRedraw(false);
789 789
		viewer2.getControl().setRedraw(false);
......
804 804
		viewer.setInput(lines);
805 805
		viewer2.setInput(lines);
806 806

  
807
		navigationWidget.setInfoLineText("" + (from + 1), //$NON-NLS-1$
808
				" - " + (to) + " / " + concordance.getNLines()); //$NON-NLS-1$ //$NON-NLS-2$
807
		navigationWidget.setInfoLineText("" + (from+1), //$NON-NLS-1$
808
				" - " + (to+1) + " / " + concordance.getNLines()); //$NON-NLS-1$ //$NON-NLS-2$
809 809

  
810 810
		navigationWidget.setPreviousEnabled(concordance.getTopIndex() > 0);
811 811
		navigationWidget.setFirstEnabled(concordance.getTopIndex() > 0);
tmp/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/ImportWizard.java (revision 1612)
2 2

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

  
7 8
import org.eclipse.jface.viewers.IStructuredSelection;
......
65 66
					project.setSourceDirectory(path.getAbsolutePath());
66 67
					project.setDescription(System.getProperty("user.name")+"\n"+TXMResult.PRETTY_LOCALIZED_TIME_FORMAT.format(Calendar.getInstance().getTime()));
67 68
					project.setLang(Locale.getDefault().getCountry());
68
					System.out.println(NLS.bind(TXMUIMessages.theP0CorpusWillBeCreatedFromTheP1Directory, project.getName(), project.getProjectDirectory()));
69
					System.out.println(NLS.bind(TXMUIMessages.theP0CorpusWillBeCreatedFromTheP1Directory, project.getName(), project.getSrcdir()));
69 70
				} else {
70
					System.out.println(NLS.bind(TXMUIMessages.theP1P0CorpusWillBeReplaced, project, project.getLastComputingDate()));
71
					Date date = project.getLastComputingDate();
72
					if (date == null) {
73
						date = Calendar.getInstance().getTime(); // today
74
					}
75
					System.out.println(NLS.bind(TXMUIMessages.theP1P0CorpusWillBeReplaced, project, date));
71 76
				}
72 77
				
73 78
				//project.compute(); // create/update files

Formats disponibles : Unified diff