/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

Révision 2275

      * @author mdecorde.
      */
     public class ConcordanceEditor extends TXMEditor<Concordance> {
     	public static final String ID = ConcordanceEditor.class.getName();
     	String locale = Locale.getDefault().getLanguage();//RCPPreferences.getInstance().getString(RCPPreferences.CONFIG_LOCALE);
     	String locale = Locale.getDefault().getLanguage();// RCPPreferences.getInstance().getString(RCPPreferences.CONFIG_LOCALE);
     	private static final String BACKTOTEXT_COMMAND_ID = "org.txm.rcp.extensionpoint.backtotext"; //$NON-NLS-1$
     	/** The lineids. */
     	List<String> lineids;
     	/** The standard comparators. */
     	private List<LineComparator> standardComparators;
     	/** The user defined comparators. */
     	private List<LineComparator> userDefinedComparators;
     	/** The complexsorter. */
     	ComplexSortSelector complexsorter;
     	org.eclipse.swt.widgets.Text cqlSeparator;
     	private Concordance concordance;
     	/** The standard comparator class name. */
     	private LineComparator[] standardComparatorClassName = {
     			new NullComparator(), new LexicographicKeywordComparator(),
     			new LexicographicLeftContextComparator(),
     			new LexicographicRightContextComparator(),
     			new PropertiesReferenceComparator() };
     	//	/** The n line per page. */
     	//	private int concordance.getNLinePerPage();
     	// /** The n line per page. */
     	// private int concordance.getNLinePerPage();
     	//
     	//	/** The top line. */
     	//	private int topLine;
     	// /** The top line. */
     	// private int topLine;
     	//
     	//	/** The bottom line. */
     	//	private int bottomLine;
     	// /** The bottom line. */
     	// private int bottomLine;
     	/** The current comparator. */
     	protected LineComparator currentComparator;
     	//	/** The left context size. */
     	//	private int leftContextSize;
     	// /** The left context size. */
     	// private int leftContextSize;
     	//
     	//	/** The right context size. */
     	//	private int rightContextSize;
     	// /** The right context size. */
     	// private int rightContextSize;
     	/** The mouseposition. */
     	private Point mouseposition;
     	/** The line table viewer. */
     	protected TableViewer viewerRight, viewerLeft;
     	/** The reference column. */
     	private TableColumn referenceColumn;
     	/** The first column. */
     	private TableColumn firstColumn; // due to a restriction on some platforms
     	// (actually, MS Windows), the first
     	// column is always left aligned. The
     	// work around is to have a 0 width
     	// first column
     	/** The left context column. */
     	private TableColumn leftContextColumn;
     	/** The keyword column. */
     	private TableColumn keywordColumn;
     	/** The right context column. */
     	private TableColumn rightContextColumn;
     	//	/** The view properties label. */
     	//	private Label viewPropertiesLabel;
     	// /** The view properties label. */
     	// private Label viewPropertiesLabel;
     	/** The set sort property action. */
     	private Action setSortPropertyAction;
     	/** The set context size action. */
     	private Action setContextSizeAction;
     	/** The set line number action. */
     	private Action setLineNumberAction;
     	/** The define view reference pattern action. */
     	protected Action defineViewReferencePatternAction;
     	/** The define sort reference pattern action. */
     	protected Action defineSortReferencePatternAction;
     	protected Action defineSortReferencePatternAction;
     	/** The set view property action. */
     	protected Action setViewPropertyAction;
     	/** The attached browser editor. */
     	protected TXMBrowser attachedBrowserEditor;
     	/** The progresslistener. */
     	protected ProgressListener progresslistener;
     	/** The textid. */
     	protected String textid;
     	/** The opened page. */
     	Page openedPage;
     	/** The query area. */
     	private Composite queryArea;
     	/** The navigation area. */
     	private NavigationWidget navigationWidget;
     	/** The hide btn: hides the form
     	 * TODO: remove the button when the TXMEditorToolbar is fully functionnal. */
     	/**
     	 * The hide btn: hides the form
     	 * TODO: remove the button when the TXMEditorToolbar is fully functionnal.
     	 */
     	private Button deleteLineButton;
     	/** The query size. */
     	protected Point querySize;
     	private Sash sash;
     	private Listener tableResizeListener;
     	private Table leftTable;
     	private Table rightTable;
     	private ScrollBar vBarLeft;
     	private ScrollBar vBarRight;
     	private Label queryLabel;
     	private Composite navigationArea;
     	/** The query widget. */
     	@Parameter(key=ConcordancePreferences.QUERY)
     	@Parameter(key = ConcordancePreferences.QUERY)
     	protected AssistedChoiceQueryWidget queryWidget;
     	@Parameter(key=ConcordancePreferences.LEFT_ANALYSIS_PROPERTIES)
     	@Parameter(key = ConcordancePreferences.LEFT_ANALYSIS_PROPERTIES)
     	private PropertiesSelector<WordProperty> leftSortProperties;
     	@Parameter(key=ConcordancePreferences.ANALYSIS_REFERENCE_PATTERN)
     	@Parameter(key = ConcordancePreferences.ANALYSIS_REFERENCE_PATTERN)
     	private PropertiesSelector<Property> refSortProperties;
     	@Parameter(key=ConcordancePreferences.KEYWORD_ANALYSIS_PROPERTIES)
     	@Parameter(key = ConcordancePreferences.KEYWORD_ANALYSIS_PROPERTIES)
     	private PropertiesSelector<WordProperty> keywordSortProperties;
     	@Parameter(key=ConcordancePreferences.RIGHT_VIEW_PROPERTIES)
     	@Parameter(key = ConcordancePreferences.RIGHT_VIEW_PROPERTIES)
     	private PropertiesSelector<WordProperty> rightViewProperties;
     	@Parameter(key=ConcordancePreferences.KEYWORD_VIEW_PROPERTIES)
     	@Parameter(key = ConcordancePreferences.KEYWORD_VIEW_PROPERTIES)
     	private PropertiesSelector<WordProperty> keywordViewProperties;
     	@Parameter(key=ConcordancePreferences.LEFT_VIEW_PROPERTIES)
     	@Parameter(key = ConcordancePreferences.LEFT_VIEW_PROPERTIES)
     	private PropertiesSelector<WordProperty> leftViewProperties;
     	@Parameter(key=ConcordancePreferences.VIEW_REFERENCE_PATTERN)
     	@Parameter(key = ConcordancePreferences.VIEW_REFERENCE_PATTERN)
     	private PropertiesSelector<Property> refViewProperties;
     	@Parameter(key=ConcordancePreferences.RIGHT_ANALYSIS_PROPERTIES)
     	@Parameter(key = ConcordancePreferences.RIGHT_ANALYSIS_PROPERTIES)
     	private PropertiesSelector<WordProperty> rightSortProperties;
     	@Parameter(key=ConcordancePreferences.LEFT_CONTEXT_SIZE)
     	@Parameter(key = ConcordancePreferences.LEFT_CONTEXT_SIZE)
     	private Spinner leftSizeSpinner;
     	@Parameter(key=ConcordancePreferences.RIGHT_CONTEXT_SIZE)
     	@Parameter(key = ConcordancePreferences.RIGHT_CONTEXT_SIZE)
     	private Spinner rightSizeSpinner;
     	//	private PropertiesSelector<Property> propsArea;
     	// private PropertiesSelector<Property> propsArea;
     	@Override
     	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
     		super.init(site, input);
     		if (!(this.result instanceof Concordance)) {
     			throw new PartInitException(ConcordanceUIMessages.bind(ConcordanceUIMessages.canNotOpenConcordanceEditorWithP0, result));
+    		}
     		this.concordance = (Concordance)this.result;
     		if (!(this.result instanceof Concordance)) { throw new PartInitException(ConcordanceUIMessages.bind(ConcordanceUIMessages.canNotOpenConcordanceEditorWithP0, result)); }
     		this.concordance = (Concordance) this.result;
     		this.standardComparators = new ArrayList<LineComparator>();
     		this.userDefinedComparators = new ArrayList<LineComparator>();
     		this.setStandardComparators();
     		concordance.setNLinePerPage(ConcordancePreferences.getInstance().getInt(ConcordancePreferences.N_LINES_PER_PAGE));
+    	}
     	@Override
     	public void _createPartControl() {
     		Composite controlArea = getExtendedParametersGroup();
     		try {
     			composeControlArea(controlArea);
     			Composite d = new Composite(getResultArea(), SWT.NONE);
-...
     			if (complexsorter != null) {
     				complexsorter.setComparators(this);
+    			}
     		} catch(Exception e) {
+    		}
     		catch (Exception e) {
     			System.out.println(ConcordanceUIMessages.bind(ConcordanceUIMessages.errorWhileBuildingInterfaceColonP0, e.getLocalizedMessage()));
     			Log.printStackTrace(e);
+    		}
+    	}
     	/**
     	 * Compose display area.
+    	 *
     	 * @param displayArea the display area
     	 */
     	private void composeDisplayArea(final Composite displayArea) throws Exception {
     		//		tableLayout = new TableColumnLayout();
     		// tableLayout = new TableColumnLayout();
     		displayArea.setLayout(new FormLayout());
     		viewerLeft = new TableViewer(displayArea, SWT.MULTI | SWT.BORDER | SWT.VIRTUAL);
     		viewerLeft.setLabelProvider(new LineLabelProvider(this) {
     			@Override
     			public String getColumnText(Object element, int columnIndex) {
     				Line line = (Line) element;
     				return line.getViewRef().toString();
+    			}
-...
     		viewerLeft.setContentProvider(new ConcordancesProvider());
     		viewerLeft.getTable().setLinesVisible(true);
     		viewerLeft.getTable().setHeaderVisible(true);
     		//		firstColumn = new TableColumn(viewer2.getTable(), SWT.LEFT);
     		//		firstColumn.setWidth(10);
     		referenceColumn = new TableColumn(viewerLeft.getTable(), SWT.LEFT|SWT.H_SCROLL);
     		// firstColumn = new TableColumn(viewer2.getTable(), SWT.LEFT);
     		// firstColumn.setWidth(10);
     		referenceColumn = new TableColumn(viewerLeft.getTable(), SWT.LEFT | SWT.H_SCROLL);
     		refreshReferenceColumnTitle();
     		referenceColumn.setToolTipText(ConcordanceUIMessages.reference);
     		referenceColumn.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				StatusLine.setMessage(ConcordanceUIMessages.sortingReferenceColumn);
     				LineComparator comparator = new PropertiesReferenceComparator();
     				if (viewerLeft.getTable().getSortColumn() != referenceColumn) {
     					viewerLeft.getTable().setSortColumn(null);
     					viewerLeft.getTable().setSortColumn(referenceColumn);
     					viewerLeft.getTable().setSortDirection(SWT.UP);
     				} else if (viewerLeft.getTable().getSortDirection() == SWT.UP) {
+    				}
     				else if (viewerLeft.getTable().getSortDirection() == SWT.UP) {
     					viewerLeft.getTable().setSortDirection(SWT.DOWN);
     					comparator = new ReverseComparator(comparator);
     				} else {
+    				}
     				else {
     					viewerLeft.getTable().setSortDirection(SWT.UP);
+    				}
     				comparator.initialize(concordance.getCorpus());
     				currentComparator = comparator;
     				complexsorter.setKey(4);//set ref key
     				complexsorter.setKey(4);// set ref key
     				sort();
     				StatusLine.setMessage(""); //$NON-NLS-1$
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			public void widgetDefaultSelected(SelectionEvent e) {}
     		});
     		referenceColumn.setWidth(100);
     		sash = new Sash(displayArea, SWT.VERTICAL);
     		sash.addSelectionListener(new SelectionAdapter() {
     			public void widgetSelected(SelectionEvent event) {
     				((FormData) sash.getLayoutData()).left = new FormAttachment(0, event.x);
     				sash.getParent().layout();
+    			}
     		});
     		viewerRight = new TableViewer(displayArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER
     				//				| SWT.VIRTUAL
     				// | SWT.VIRTUAL
     				);
     		//viewer.setLabelProvider(new LineLabelProvider(this));
     		// viewer.setLabelProvider(new LineLabelProvider(this));
     		viewerRight.setContentProvider(new ConcordancesProvider());
     		viewerRight.getTable().setLinesVisible(true);
     		viewerRight.getTable().setHeaderVisible(true);
     		String f = concordance.getCorpus().getFont();
     		if (f != null && f.length() > 0) {
     			Font old = viewerRight.getTable().getFont();
     			FontData fD = old.getFontData()[0];
     			Font font = new Font(Display.getCurrent(), f, fD.getHeight(), fD.getStyle());
     			Font font = new Font(Display.getCurrent(), f, fD.getHeight(), fD.getStyle());
     			viewerRight.getTable().setFont(font);
     			viewerLeft.getTable().setFont(font);
+    		}
     		tableResizeListener = new Listener() {
     			@Override
     			public void handleEvent(Event event) {
     				ScrollBar bar = viewerRight.getTable().getHorizontalBar();
     				float l=leftContextColumn.getWidth();
     				float k=keywordColumn.getWidth();
     				float r=rightContextColumn.getWidth();
     				float t=viewerRight.getTable().getClientArea().width;//the width of the visible part of the table; l+k+r>=t
     				float x=l+k/2-t/2; //the abcisse the visible rectangle must have for the keyword column to be centered
     				float M=bar.getMaximum();
     				float T=bar.getThumb();
     				bar.setSelection(Math.round(x*(M-T)/(l+k+r-t)));//this is how x translate in terms of bar selection
     				float l = leftContextColumn.getWidth();
     				float k = keywordColumn.getWidth();
     				float r = rightContextColumn.getWidth();
     				float t = viewerRight.getTable().getClientArea().width;// the width of the visible part of the table; l+k+r>=t
     				float x = l + k / 2 - t / 2; // the abcisse the visible rectangle must have for the keyword column to be centered
     				float M = bar.getMaximum();
     				float T = bar.getThumb();
     				bar.setSelection(Math.round(x * (M - T) / (l + k + r - t)));// this is how x translate in terms of bar selection
+    			}
     		};
     		// try to center on keyword column
     		viewerRight.getTable().addListener(SWT.Resize, tableResizeListener);
     		//TODO: to enable line deletion, Concordance code must updated -> replace with key binding
     		// TODO: to enable line deletion, Concordance code must updated -> replace with key binding
     		KeyListener kldelete = new KeyListener() {
     			@Override
     			public void keyReleased(KeyEvent e) {	}
     			public void keyReleased(KeyEvent e) {}
     			@Override
     			public void keyPressed(KeyEvent e) {
     				if (e.keyCode != SWT.DEL ) { return; }
     				if (e.keyCode != SWT.DEL) { return; }
     				DeleteLines.deleteConcordanceLines(ConcordanceEditor.this);
+    			}
     		};
     		viewerRight.getTable().addKeyListener(kldelete);
     		viewerLeft.getTable().addKeyListener(kldelete);
     		TableKeyListener tlistener = new TableKeyListener(viewerLeft, viewerRight);
     		viewerRight.getTable().addKeyListener(tlistener);
     		viewerLeft.getTable().addKeyListener(tlistener);
-...
     		firstColumn = new TableColumn(viewerRight.getTable(), SWT.LEFT);
     		firstColumn.setWidth(0);
     		firstColumn.setResizable(false);
     		TableViewerColumn leftColumnViewer = new TableViewerColumn(viewerRight, SWT.RIGHT);
     		leftContextColumn = leftColumnViewer.getColumn();
     		leftContextColumn.setText(ConcordanceUIMessages.leftContext);
     		leftContextColumn.setToolTipText(ConcordanceUIMessages.leftContext);
     		leftContextColumn.setAlignment(SWT.RIGHT);
     		leftColumnViewer.setLabelProvider(new ColumnLabelProvider() {
     			@Override
     			public String getText(Object element) {
     				Line line = (Line) element;
     				return line.leftContextToString();
+    			}
     		});
     		leftContextColumn.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				StatusLine.setMessage(ConcordanceUIMessages.sortingLeftContextColumn);
     				LineComparator comparator = new LexicographicLeftContextComparator();
     				if (viewerRight.getTable().getSortColumn() != leftContextColumn) {
     					viewerRight.getTable().setSortColumn(leftContextColumn);
     					viewerRight.getTable().setSortDirection(SWT.UP);
     				} else if (viewerRight.getTable().getSortDirection() == SWT.UP) {
+    				}
     				else if (viewerRight.getTable().getSortDirection() == SWT.UP) {
     					viewerRight.getTable().setSortDirection(SWT.DOWN);
     					comparator = new ReverseComparator(comparator);
     				} else
+    				}
     				else
     					viewerRight.getTable().setSortDirection(SWT.UP);
     				comparator.initialize(concordance.getCorpus());
     				currentComparator = comparator;
     				complexsorter.setKey(2);//set ref key
     				complexsorter.setKey(2);// set ref key
     				sort();
     				StatusLine.setMessage(""); //$NON-NLS-1$
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			public void widgetDefaultSelected(SelectionEvent e) {}
     		});
     		TableViewerColumn keywordColumnViewer = new TableViewerColumn(viewerRight, SWT.CENTER);
     		keywordColumn = keywordColumnViewer.getColumn();
     		keywordColumn.setText(ConcordanceUIMessages.keyword);
     		keywordColumn.setToolTipText(ConcordanceUIMessages.keyword);
     		keywordColumn.setAlignment(SWT.CENTER);
     		keywordColumnViewer.setLabelProvider(new ColumnLabelProvider() {
     			@Override
     			public String getText(Object element) {
     				Line line = (Line) element;
     				return line.keywordToString();
+    			}
     		});
     		keywordColumn.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				StatusLine.setMessage(ConcordanceUIMessages.sortingKeywordColumn);
     				LineComparator comparator = new LexicographicKeywordComparator();
     				if (viewerRight.getTable().getSortColumn() != keywordColumn) {
-...
+    				}
     				comparator.initialize(concordance.getCorpus());
     				currentComparator = comparator;
     				complexsorter.setKey(1);//set ref key
     				complexsorter.setKey(1);// set ref key
     				sort();
     				StatusLine.setMessage(""); //$NON-NLS-1$
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			public void widgetDefaultSelected(SelectionEvent e) {}
     		});
     		TableViewerColumn rightContextColumnViewer = new TableViewerColumn(viewerRight, SWT.LEFT);
     		rightContextColumn = rightContextColumnViewer.getColumn();
     		rightContextColumn.setText(ConcordanceUIMessages.rightContext);
     		rightContextColumn.setToolTipText(ConcordanceUIMessages.rightContext);
     		rightContextColumn.setAlignment(SWT.LEFT);
     		rightContextColumnViewer.setLabelProvider(new ColumnLabelProvider() {
     			@Override
     			public String getText(Object element) {
     				Line line = (Line) element;
     				return line.rightContextToString();
+    			}
     		});
     		rightContextColumn.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				StatusLine.setMessage(ConcordanceUIMessages.sortingRightContextColumn);
     				LineComparator comparator = new LexicographicRightContextComparator();
     				if (viewerRight.getTable().getSortColumn() != rightContextColumn) {
     					viewerRight.getTable().setSortColumn(rightContextColumn);
+    				}
-...
+    				}
     				comparator.initialize(concordance.getCorpus());
     				currentComparator = comparator;
     				complexsorter.setKey(3); //set ref key
     				complexsorter.setKey(3); // set ref key
     				sort();
     				StatusLine.setMessage(""); //$NON-NLS-1$
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			public void widgetDefaultSelected(SelectionEvent e) {}
     		});
     		//		firstColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
     		//		firstColumn.setWidth(0);
     		//		firstColumn.setResizable(false);
     		// firstColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
     		// firstColumn.setWidth(0);
     		// firstColumn.setResizable(false);
     		leftContextColumn.setWidth(200);
     		keywordColumn.setWidth(100);
     		rightContextColumn.setWidth(200);
     		//resetColumnWidths(); // set column widths
     		//		// And now, a sweet piece of code :)
     		//		// When the window is resized, the scrollbar is adjusted so that the
     		//		// keywords remain centered
     		//		viewer.getTable().addListener(SWT.Resize, new Listener() {
     		//			@Override
     		//			public void handleEvent(Event event) {
     		//				ScrollBar bar = viewer.getTable().getHorizontalBar();
     		//				//float l = leftContextColumn.getWidth();
     		//				//float k = keywordColumn.getWidth();
     		//				rightContextColumn.getWidth();
     		//				//float t = lineTableViewer.getTable().getClientArea().width;
     		//				bar.getMaximum();
     		//				bar.getThumb();
     		//			}
     		//		});
     		// resetColumnWidths(); // set column widths
     		// // And now, a sweet piece of code :)
     		// // When the window is resized, the scrollbar is adjusted so that the
     		// // keywords remain centered
     		// viewer.getTable().addListener(SWT.Resize, new Listener() {
     		// @Override
     		// public void handleEvent(Event event) {
     		// ScrollBar bar = viewer.getTable().getHorizontalBar();
     		// //float l = leftContextColumn.getWidth();
     		// //float k = keywordColumn.getWidth();
     		// rightContextColumn.getWidth();
     		// //float t = lineTableViewer.getTable().getClientArea().width;
     		// bar.getMaximum();
     		// bar.getThumb();
     		// }
     		// });
     		// back to text mouse listener
     		MouseListener ms = new MouseListener() {
     			int c = 0;
     			@Override
     			public synchronized void mouseDoubleClick(MouseEvent e) {
     				if (e.count == 2 && c == 0) {
     					c++;
-...
     					c--;
+    				}
+    			}
     			@Override
     			public void mouseDown(MouseEvent e) { }
     			public void mouseDown(MouseEvent e) {}
     			@Override
     			public void mouseUp(MouseEvent e) {	}
     			public void mouseUp(MouseEvent e) {}
     		};
     		viewerRight.getTable().addMouseListener(ms);
     		viewerLeft.getTable().addMouseListener(ms);
     		// On Windows, the selection is gray if the table does not have focus.
     		// To make both tables appear in focus, draw the selection background
     		// here.
     		// This part only works on version 3.2 or later.
     		Listener eraseListener = new Listener() {
     			@Override
     			public void handleEvent(Event event) {
     				event.detail &= ~SWT.HOT;
     				if ((event.detail & SWT.SELECTED) != 0) {
     					GC gc = event.gc;
-...
+    				}
+    			}
     		};
     		// Listeners to avoid 0 width columns
     		referenceColumn.addControlListener(new ConcordanceColumnSizeControlListener(referenceColumn));
     		leftContextColumn.addControlListener(new ConcordanceColumnSizeControlListener(leftContextColumn));
     		keywordColumn.addControlListener(new ConcordanceColumnSizeControlListener(keywordColumn));
     		rightContextColumn.addControlListener(new ConcordanceColumnSizeControlListener(rightContextColumn));
     		viewerRight.getTable().addListener(SWT.EraseItem, eraseListener);
     		leftTable = viewerLeft.getTable();
     		rightTable = viewerRight.getTable();
     		viewerLeft.getTable().addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				rightTable.deselectAll();
     				rightTable.select(leftTable.getSelectionIndices());
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) { }
     			public void widgetDefaultSelected(SelectionEvent e) {}
     		});
     		vBarLeft = viewerLeft.getTable().getVerticalBar();
     		vBarLeft.addListener(SWT.Selection, new Listener() {
     			@Override
     			public void handleEvent(Event event) {
     				if (Util.isLinux()) {
     					vBarRight.setSelection(vBarLeft.getSelection());
     				} else {
+    				}
     				else {
     					viewerRight.getTable().setTopIndex(viewerLeft.getTable().getTopIndex());
+    				}
+    			}
     		});
     		viewerRight.getTable().addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				leftTable.deselectAll();
     				leftTable.select(rightTable.getSelectionIndices());
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) { }
     			public void widgetDefaultSelected(SelectionEvent e) {}
     		});
     		vBarRight = viewerRight.getTable().getVerticalBar();
     		vBarRight.addListener(SWT.Selection, new Listener() {
     			@Override
     			public void handleEvent(Event event) {
     				if (Util.isLinux()) {
     					vBarLeft.setSelection(vBarRight.getSelection());
     				} else {
     					viewerLeft.getTable().setTopIndex(viewerRight.getTable().getTopIndex());
+    				}
     				else {
     					viewerLeft.getTable().setTopIndex(viewerRight.getTable().getTopIndex());
+    				}
+    			}
     		});
     		// set Layout datas
     		FormData data = new FormData();
     		data.top = new FormAttachment(0);
     		data.bottom = new FormAttachment(100);
     		data.top = new FormAttachment(0);
     		data.bottom = new FormAttachment(100);
     		data.left = new FormAttachment(0);
     		data.right = new FormAttachment(sash,0);
     		data.right = new FormAttachment(sash, 0);
     		viewerLeft.getTable().setLayoutData(data);
     		FormData data2 = new FormData();
     		data2.top = new FormAttachment(0, 0);
     		data2.bottom = new FormAttachment(100, 0);
     		data2.top = new FormAttachment(0, 0);
     		data2.bottom = new FormAttachment(100, 0);
     		data2.left = new FormAttachment(10);
     		sash.setLayoutData(data2);
     		FormData data3 = new FormData();
     		data3.top = new FormAttachment(0);
     		data3.bottom = new FormAttachment(100);
     		data3.left = new FormAttachment(sash,0);
     		data3.top = new FormAttachment(0);
     		data3.bottom = new FormAttachment(100);
     		data3.left = new FormAttachment(sash, 0);
     		data3.right = new FormAttachment(100);
     		viewerRight.getTable().setLayoutData(data3);
     		createContextMenu();
+    	}
     	/**
     	 * Sort.
     	 */
     	public void sort() {
     		if (concordance != null && currentComparator != null) {
     			//System.out.println("concordance sort props: "+concordance.getLeftCAnalysisProperty()+", "+concordance.getKeywordAnalysisProperty()+", "+concordance.getRightCAnalysisProperty());
     			// System.out.println("concordance sort props: "+concordance.getLeftCAnalysisProperty()+", "+concordance.getKeywordAnalysisProperty()+", "+concordance.getRightCAnalysisProperty());
     			concordance.resetLines();
     			try {
     				Log.fine(NLS.bind(ConcordanceUIMessages.sortingWithP0, currentComparator.getName()));
     				if (currentComparator instanceof CompositeComparator) {
     					Log.fine(((CompositeComparator) currentComparator).getComparators().toString());
+    				}
     				JobHandler jobhandler = new JobHandler("Sorting...") { //$NON-NLS-1$
     					@Override
     					protected IStatus run(IProgressMonitor monitor) {
     						this.runInit(monitor);
     						JobsTimer.start();
     						try {
-...
     							concordance.setTopIndex(0);
     							concordance.setCurrentMonitor(null);
     							syncExec(new Runnable() {
     								@Override
     								public void run() {
     									StatusLine.setMessage(TXMUIMessages.sortDone);
     									try {
     										refresh(true);
     									} catch (Exception e1) {
+    									}
     									catch (Exception e1) {
     										// TODO Auto-generated catch block
     										e1.printStackTrace();
+    									}
+    								}
     							});
     						} catch (ThreadDeath td) {
+    						}
     						catch (ThreadDeath td) {
     							return Status.CANCEL_STATUS;
     						} catch (Exception e) {
+    						}
     						catch (Exception e) {
     							System.err.println(NLS.bind(ConcordanceUIMessages.anErrorOccurredWhileRetrievingTheConcordanceLinesColonP0, e));
     							org.txm.utils.logger.Log.printStackTrace(e);
     						} catch (Error e) {
     							System.err.println(ConcordanceUIMessages.bind(ConcordanceUIMessages.fatalErrorColonP0,e));
+    						}
     						catch (Error e) {
     							System.err.println(ConcordanceUIMessages.bind(ConcordanceUIMessages.fatalErrorColonP0, e));
     							e.printStackTrace();
     						} finally {
+    						}
     						finally {
     							monitor.done();
     							JobsTimer.stopAndPrint();
+    						}
     						return Status.OK_STATUS;
+    					}
     				};
     				jobhandler.startJob();
     			} catch (Exception e) {
+    			}
     			catch (Exception e) {
     				System.err.println(NLS.bind(ConcordanceUIMessages.anErrorOccurredWhileRetrievingTheConcordanceLinesColonP0, e));
     				org.txm.utils.logger.Log.printStackTrace(e);
+    			}
+    		}
+    	}
     	/**
     	 * Lazy loads the concordance lines range and fills the display area.
+    	 *
-...
     	 * @param to the to
     	 */
     	public void fillDisplayArea(boolean update) {
     		if (viewerRight == null) {
     			return;
+    		}
     		if (viewerRight == null) { return; }
     		int from = concordance.getTopIndex();
     		from = Math.max(from, 0);
     		int to = from + concordance.getNLinePerPage();
     		to = Math.min(to, concordance.getNLines()) - 1;
     		viewerRight.getControl().setRedraw(false);
     		viewerLeft.getControl().setRedraw(false);
     		List<Line> lines = null;
     		if (concordance.getNLines() > 0) {
     			try {
     				lines = concordance.getLines(from, to);
     			} catch (Exception e) {
+    			}
     			catch (Exception e) {
     				System.err.println(NLS.bind(ConcordanceUIMessages.anErrorOccurredWhileRetrievingTheConcordanceLinesColonP0, e));
     				org.txm.utils.logger.Log.printStackTrace(e);
+    			}
-...
     		else {
     			lines = new ArrayList<Line>();
+    		}
     		viewerRight.setInput(lines);
     		viewerLeft.setInput(lines);
     		navigationWidget.setInfoLineText("" + (from+1), " - " + (to+1) + " / " + concordance.getNLines()); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-3$
     		navigationWidget.setInfoLineText("" + (from + 1), " - " + (to + 1) + " / " + concordance.getNLines()); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-3$
     		navigationWidget.setPreviousEnabled(concordance.getTopIndex() > 0);
     		navigationWidget.setFirstEnabled(concordance.getTopIndex() > 0);
     		navigationWidget.setNextEnabled((concordance.getTopIndex() + concordance.getNLinePerPage()) < concordance.getNLines() - 1);
     		navigationWidget.setLastEnabled((concordance.getTopIndex() + concordance.getNLinePerPage()) < concordance.getNLines() - 1);
     		navigationWidget.layout();
     		navigationWidget.getParent().layout();
     		refreshReferenceColumnTitle();
     		viewerRight.getControl().setRedraw(true);
     		viewerLeft.getControl().setRedraw(true);
+    	}
     	/**
     	 * Get the Composite that contains the query and sort forms
+    	 *
-...
     	 * @return
     	 */
     	public Composite getQueryArea() {
     		return queryArea;
+    	}
     	/**
     	 * Get the Composite that contains the navigation buttons
+    	 *
-...
     	 * @return
     	 */
     	public Composite getNavigationArea() {
     		return queryArea;
+    	}
     	/**
     	 * Compose control area.
+    	 *
     	 * @param controlArea the control area
     	 */
     	private void composeControlArea(final Composite controlArea) {
     		// Modified computing listeners to manage multi lines query widgets
     		ComputeKeyListener computeKeyListener = new ComputeKeyListener(this) {
     			@Override
     			public void keyPressed(KeyEvent e) {
     				if (queryWidget.getQuery() == null) return;
     				if (!queryWidget.getQuery().getSearchEngine().hasMultiLineQueries()) super.keyPressed(e);
+    			}
     		};
     		GridLayout controlLayout = new GridLayout(1, false);
     		controlLayout.verticalSpacing = 0;
     		controlLayout.marginWidth = 0;
     		controlLayout.marginHeight = 0;
     		controlArea.setLayout(controlLayout);
     		// Query Area: query itself + view properties
     		queryArea = new Composite(controlArea, SWT.NONE);
     		queryArea.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
     		queryArea.setLayout(new GridLayout(4, false));
     		////////////////////////////////
     		//composeAnnotationArea(controlArea);
     		// composeAnnotationArea(controlArea);
     		//////////////////////////////////
     		navigationArea = new Composite(controlArea, SWT.NONE);
     		navigationArea.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
     		GridLayout navigationLayout = new GridLayout(7, false);
     		GridLayout navigationLayout = new GridLayout(7, false);
     		navigationLayout.verticalSpacing = 0;
     		navigationLayout.marginWidth = 0;
     		navigationLayout.marginHeight = 0;
     		navigationArea.setLayout(navigationLayout);
     		///////////////////////////
     		// | Query: [ (v)] [Search] |
     		// Query:
     		getMainParametersComposite().getLayout().numColumns = 2;
     		// make
     		getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
     		queryLabel = new Label(getMainParametersComposite(), SWT.NONE);
     		queryLabel.setText(TXMUIMessages.ampQuery);
     		queryLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
     		// [ (v)]
     		queryWidget = new AssistedChoiceQueryWidget(this.getMainParametersComposite(), SWT.DROP_DOWN|SWT.MULTI| SWT.WRAP | SWT.V_SCROLL, concordance.getCorpus());
     		queryWidget = new AssistedChoiceQueryWidget(this.getMainParametersComposite(), SWT.DROP_DOWN | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL, concordance.getCorpus());
     		queryWidget.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
     		queryWidget.addKeyListener(computeKeyListener);
     		queryWidget.getQueryWidget().addModifyListener(computeKeyListener);
     		// FIXME: SJ: for computing when changing the query from history combo box
     		// FIXME: SJ: commented because it doesn't work, the computing is launched as soon as we click on the arrow of the combo box
     		//queryWidget.getQueryWidget().addSelectionListener(new ComputeSelectionListener(this));
     		// queryWidget.getQueryWidget().addSelectionListener(new ComputeSelectionListener(this));
     		// hide the parameters panel
     		//getTopToolbar().setVisible(TXMEditor.COMPUTING_PARAMETERS_GROUP_ID, false); // the settings are not necessary to compute the concordance
     		// getTopToolbar().setVisible(TXMEditor.COMPUTING_PARAMETERS_GROUP_ID, false); // the settings are not necessary to compute the concordance
     		// | Properties: word/pos [Edit] |
     		//		propsArea = new PropertiesSelector<Property>(queryArea, SWT.NONE);
     		//		propsArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
     		//		propsArea.setLayout(new GridLayout(3, false));
     		//		this.propsArea.setProperties(concordance.getAvailableKeywordViewProperties(), concordance.getKeywordViewProperties());
     		//		propsArea.addValueChangeListener(new Listener() {
     		//			@Override
     		//			public void handleEvent(Event event) {
     		//				concordance.setKeywordViewProperties(propsArea.getSelectedProperties());
     		//				refreshViewProperties();
     		//			}
     		//		});
     		// propsArea = new PropertiesSelector<Property>(queryArea, SWT.NONE);
     		// propsArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
     		// propsArea.setLayout(new GridLayout(3, false));
     		// this.propsArea.setProperties(concordance.getAvailableKeywordViewProperties(), concordance.getKeywordViewProperties());
     		// propsArea.addValueChangeListener(new Listener() {
     		// @Override
     		// public void handleEvent(Event event) {
     		// concordance.setKeywordViewProperties(propsArea.getSelectedProperties());
     		// refreshViewProperties();
     		// }
     		// });
     		// [Search]
     		//		Button go = new Button(queryArea, SWT.PUSH);
     		//		go.setText(TXMUIMessages.SEARCH);
     		// Button go = new Button(queryArea, SWT.PUSH);
     		// go.setText(TXMUIMessages.SEARCH);
     		//
     		//		Font f = go.getFont();
     		//		FontData defaultFont = f.getFontData()[0];
     		//		defaultFont.setStyle(SWT.BOLD);
     		//		Font newf = new Font(go.getDisplay(), defaultFont);
     		//		go.setFont(newf);
     		// Font f = go.getFont();
     		// FontData defaultFont = f.getFontData()[0];
     		// defaultFont.setStyle(SWT.BOLD);
     		// Font newf = new Font(go.getDisplay(), defaultFont);
     		// go.setFont(newf);
     		//
     		//		go.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
     		//		go.addSelectionListener(new ComputeSelectionListener(this));
     		// go.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
     		// go.addSelectionListener(new ComputeSelectionListener(this));
     		// Complex sort chooser (full line)
     		complexsorter = new ComplexSortSelector(queryArea, SWT.NONE);
     		complexsorter.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, true, 4, 1));
     		// properties widget like in the portal version
     		GLComposite propertiesPanel = new GLComposite(queryArea, SWT.BORDER, ConcordanceUIMessages.propertiesPanel);
     		propertiesPanel.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, true, 4, 1));
     		propertiesPanel.getLayout().numColumns = 5;
     		propertiesPanel.getLayout().makeColumnsEqualWidth = false;
     		try {
     			Label l = new Label(propertiesPanel, SWT.NONE);
     			l.setText(ConcordanceUIMessages.editor_21);
     			l.setLayoutData(new GridData(GridData.CENTER,GridData.CENTER, false, false));
     			l.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
     			l = new Label(propertiesPanel, SWT.NONE);
     			l.setText(ConcordanceUIMessages.references);
     			l.setLayoutData(new GridData(GridData.CENTER,GridData.CENTER, true, false));
     			l.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, true, false));
     			l = new Label(propertiesPanel, SWT.NONE);
     			l.setText(ConcordanceUIMessages.left);
     			l.setLayoutData(new GridData(GridData.CENTER,GridData.CENTER, true, false));
     			l.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, true, false));
     			l = new Label(propertiesPanel, SWT.NONE);
     			l.setText(ConcordanceUIMessages.keyword);
     			l.setLayoutData(new GridData(GridData.CENTER,GridData.CENTER, true, false));
     			l.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, true, false));
     			l = new Label(propertiesPanel, SWT.NONE);
     			l.setText(ConcordanceUIMessages.right);
     			l.setLayoutData(new GridData(GridData.CENTER,GridData.CENTER, true, false));
     			l.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, true, false));
     			l = new Label(propertiesPanel, SWT.NONE);
     			l.setText(ConcordanceUIMessages.view);
     			l.setLayoutData(new GridData(GridData.CENTER,GridData.CENTER, false, false));
     			l.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
     			refViewProperties = new PropertiesSelector<Property>(propertiesPanel, SWT.NONE);
     			refViewProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
     			refViewProperties.setTitle(ConcordanceUIMessages.editor_21);
     			refViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
     			refViewProperties.setProperties(ReferencePattern.getPossibleValues(getCorpus()));
     			refViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setRefViewPattern(new ReferencePattern(refViewProperties.getSelectedProperties()));
     					super.widgetSelected(e);
+    				}
-...
     			leftViewProperties.setProperties(getCorpus().getOrderedProperties());
     			leftViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
     			leftViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setLeftViewProperties(leftViewProperties.getSelectedProperties());
     					super.widgetSelected(e);
+    				}
-...
     			keywordViewProperties.setProperties(getCorpus().getOrderedProperties());
     			keywordViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
     			keywordViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setKeywordViewProperties(keywordViewProperties.getSelectedProperties());
     					super.widgetSelected(e);
+    				}
-...
     			rightViewProperties.setProperties(getCorpus().getOrderedProperties());
     			rightViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
     			rightViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setRightViewProperties(rightViewProperties.getSelectedProperties());
     					super.widgetSelected(e);
+    				}
     			});
     			l = new Label(propertiesPanel, SWT.NONE);
     			l.setText(ConcordanceUIMessages.sort);
     			l.setLayoutData(new GridData(GridData.CENTER,GridData.CENTER, false, false));
     			l.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
     			refSortProperties = new PropertiesSelector<Property>(propertiesPanel, SWT.NONE);
     			refSortProperties.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
     			refSortProperties.setTitle(ConcordanceUIMessages.editor_21);
     			refSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
     			refSortProperties.setProperties(ReferencePattern.getPossibleValues(getCorpus()));
     			refSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setRefAnalysePattern(new ReferencePattern(refSortProperties.getSelectedProperties()));
     					super.widgetSelected(e);
+    				}
-...
     			leftSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
     			leftSortProperties.setProperties(getCorpus().getOrderedProperties());
     			leftSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setLeftAnalysisProperties(leftSortProperties.getSelectedProperties());
     					super.widgetSelected(e);
+    				}
-...
     			keywordSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
     			keywordSortProperties.setProperties(getCorpus().getOrderedProperties());
     			keywordSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setKeywordAnalysisProperties(keywordSortProperties.getSelectedProperties());
     					super.widgetSelected(e);
+    				}
-...
     			rightSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
     			rightSortProperties.setProperties(getCorpus().getOrderedProperties());
     			rightSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setRightAnalysisProperties(rightSortProperties.getSelectedProperties());
     					super.widgetSelected(e);
+    				}
     			});
     			l = new Label(propertiesPanel, SWT.NONE);
     			l.setText(ConcordanceUIMessages.size);
     			l.setLayoutData(new GridData(GridData.CENTER,GridData.CENTER, false, false));
     			l.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
     			new Label(propertiesPanel, SWT.NONE);
     			leftSizeSpinner = new Spinner(propertiesPanel, SWT.BORDER);
     			leftSizeSpinner.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
     			leftSizeSpinner.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setLeftContextSize(leftSizeSpinner.getSelection());
     					super.widgetSelected(e);
+    				}
     			});
     			leftSizeSpinner.addKeyListener(new KeyListener() {
     				@Override
     				public void keyReleased(KeyEvent e) {
     					if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
     						concordance.setLeftContextSize(leftSizeSpinner.getSelection());
     						ConcordanceEditor.this.compute(true);
+    					}
+    				}
     				@Override
     				public void keyPressed(KeyEvent e) { }
     				public void keyPressed(KeyEvent e) {}
     			});
     			new Label(propertiesPanel, SWT.NONE);
     			rightSizeSpinner = new Spinner(propertiesPanel, SWT.BORDER);
     			rightSizeSpinner.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
     			rightSizeSpinner.addSelectionListener(new ComputeSelectionListener(this) {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					concordance.setRightContextSize(rightSizeSpinner.getSelection());
     					super.widgetSelected(e);
+    				}
     			});
     			rightSizeSpinner.addKeyListener(new KeyListener() {
     				@Override
     				public void keyReleased(KeyEvent e) {
     					if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
     						concordance.setRightContextSize(rightSizeSpinner.getSelection());
     						ConcordanceEditor.this.compute(true);
+    					}
+    				}
     				@Override
     				public void keyPressed(KeyEvent e) { }
     				public void keyPressed(KeyEvent e) {}
     			});
     		} catch (Exception e1) {
+    		}
     		catch (Exception e1) {
     			// TODO Auto-generated catch block
     			e1.printStackTrace();
+    		}
     		// Delete line button
     		deleteLineButton = new Button(navigationArea, SWT.PUSH);
     		deleteLineButton.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
     		deleteLineButton.setToolTipText(ConcordanceUIMessages.deleteSelectedLines);
     		deleteLineButton.setImage(IImageKeys.getImage(IImageKeys.ACTION_DELETE));
     		deleteLineButton.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				DeleteLines.deleteConcordanceLines(ConcordanceEditor.this);
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) { }
     			public void widgetDefaultSelected(SelectionEvent e) {}
     		});
     		// Navigation Area: infoLine and buttons
     		GLComposite navigationAreaComposite = getBottomToolbar().installGLComposite(ConcordanceUIMessages.navigation, 1, false);
     		navigationAreaComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
     		navigationWidget = new NavigationWidget(navigationAreaComposite, SWT.NONE);
     		navigationWidget.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, false));
     		// | [|<] [<] infos [>] [>|] |
     		// [|<]
     		navigationWidget.addFirstListener(new SelectionListener() {
     			@Override
     			public void widgetDefaultSelected(SelectionEvent arg0) {
+    			}
     			public void widgetDefaultSelected(SelectionEvent arg0) {}
     			@Override
     			public void widgetSelected(SelectionEvent arg0) {
     				concordance.setTopIndex(0);
     				try {
     					refresh(false);
     					viewerRight.getTable().setTopIndex(0);
     				} catch (Exception e1) {
+    				}
     				catch (Exception e1) {
     					// TODO Auto-generated catch block
     					e1.printStackTrace();
+    				}
+    			}
     		});
     		// [<]
     		navigationWidget.addPreviousListener(new SelectionListener() {
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			public void widgetDefaultSelected(SelectionEvent e) {}
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				int top = concordance.getTopIndex() - concordance.getNLinePerPage();
     				if (top < 0)
     					top = 0;
-...
     				try {
     					refresh(false);
     					viewerRight.getTable().setTopIndex(0);
     				} catch (Exception e1) {
+    				}
     				catch (Exception e1) {
     					// TODO Auto-generated catch block
     					e1.printStackTrace();
+    				}
+    			}
     		});
     		// [>]
     		navigationWidget.addNextListener(new SelectionListener() {
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			public void widgetDefaultSelected(SelectionEvent e) {}
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				concordance.setTopIndex(concordance.getTopIndex() + concordance.getNLinePerPage());
     				try {
     					refresh(false);
     					viewerRight.getTable().setTopIndex(0);
     				} catch (Exception e1) {
+    				}
     				catch (Exception e1) {
     					// TODO Auto-generated catch block
     					e1.printStackTrace();
+    				}
+    			}
     		});
     		// [>|]
     		navigationWidget.addLastListener(new SelectionListener() {
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			public void widgetDefaultSelected(SelectionEvent e) {}
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				int top = (concordance.getNLines() / concordance.getNLinePerPage()) * concordance.getNLinePerPage();
     				// FIXME: SJ: became useless?
     				//int bottom = top + concordance.getNLinePerPage() -1;
     				// int bottom = top + concordance.getNLinePerPage() -1;
     				concordance.setTopIndex(top);
     				try {
     					refresh(false);
     					viewerRight.getTable().setTopIndex(0);
     				} catch (Exception e1) {
+    				}
     				catch (Exception e1) {
     					// TODO Auto-generated catch block
     					e1.printStackTrace();
+    				}
+    			}
     		});
     		queryArea.layout();
+    	}
     	/**
     	 * refresh
+    	 *
     	 * @param top
     	 * @param bottom
     	 */
     	public void updateEditorFromResult(boolean update) {
     		StatusLine.setMessage(ConcordanceUIMessages.startComputingConcordance);
     		try {
     			QueriesView.refresh();
     			this.fillDisplayArea(update);
     			boolean b = concordance.getQueryResultParameter() == null;
     			this.queryWidget.setEnabled(b); // disable the widget if a QueryResult was provided
     			this.queryWidget.memorize();
     			if (update) {
     				resetColumnWidths();

... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff

Laboratoire ICAR » Plateforme TXM

Révision 2275