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

     	String locale = TXMPreferences.getString(RCPPreferences.UI_LOCALE, RCPPreferences.PREFERENCES_NODE);
     	private static final String BACKTOTEXT_COMMAND_ID = "org.txm.rcp.extensionpoint.backtotext"; //$NON-NLS-1$
     	/** The lineids. */
-...
     	/** 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;
-...
     	private Listener tableResizeListener;
     	/** The query widget. */
     	@Parameter(key=ConcordancePreferences.QUERY)
     	protected AssistedQueryWidget queryWidget;
-...
     	@Override
     	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
     		super.init(site, input);
     		TXMResult result = this.getResult();
     		if (!(result instanceof Concordance)) {
     			throw new PartInitException("Can not open ConcordanceEditor with " + result + ".");
+    		}
-...
+    			}
     		});
     		viewer = new TableViewer(displayArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER
     //				| SWT.VIRTUAL
     				//				| SWT.VIRTUAL
     				);
     		viewer.getTable().addKeyListener(new TableKeyListener(viewer));
     		//viewer.setLabelProvider(new LineLabelProvider(this));
-...
     		viewer.getTable().addKeyListener(kldelete);
     		viewer2.getTable().addKeyListener(kldelete);
     		//		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);
     		TableViewerColumn leftColumnViewer = new TableViewerColumn(viewer, SWT.RIGHT);
     		leftContextColumn = leftColumnViewer.getColumn();
-...
     		int from = concordance.getTopIndex();
     		from = Math.max(from, 0);
     		int to = from + concordance.getNLinePerPage() - 1;
     		to = Math.min(to, concordance.getNLines());
     		viewer.getControl().setRedraw(false);
     		viewer2.getControl().setRedraw(false);
     		List<Line> lines = null;
     		if (concordance.getNLines() > 0) {
     			try {
-...
     	@Parameter(key=ConcordancePreferences.RIGHT_CONTEXT_SIZE)
     	private Spinner rightSizeSpinner;
     //	private PropertiesSelector<Property> propsArea;
     	//	private PropertiesSelector<Property> propsArea;
     	/**
     	 * Get the Composite that contains the query and sort forms
-...
     		getMainParametersComposite().getLayout().numColumns = 2;
     		// make
     		getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
     		queryLabel = new Label(getMainParametersComposite(), SWT.NONE);
     		queryLabel.setText(TXMUIMessages.CreateSubcorpusDialog_10);
     		queryLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
-...
     		// hide the parameters panel
     		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);
     //
     //		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));
     		//		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);
     		//
     		//		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.FILL, true,
     				true, 4, 1));
     		// properties widget like in the portal version
     		GLComposite propertiesPanel = new GLComposite(queryArea, SWT.BORDER);
     		GLComposite propertiesPanel = new GLComposite(queryArea, SWT.BORDER, "Properties panel");
     		propertiesPanel.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
     				true, 4, 1));
     		propertiesPanel.getLayout().numColumns = 5;
     		propertiesPanel.getLayout().makeColumnsEqualWidth = true;
     		try {
     			Label l = new Label(propertiesPanel, SWT.NONE);
     			l.setText("");
-...
     			new Label(propertiesPanel, SWT.NONE).setText("Left");
     			new Label(propertiesPanel, SWT.NONE).setText("Keyword");
     			new Label(propertiesPanel, SWT.NONE).setText("Right");
     			new Label(propertiesPanel, SWT.NONE).setText("View");
     			refViewProperties = new PropertiesSelector<Property>(propertiesPanel, SWT.NONE);
     			refViewProperties.setTitle("");
-...
     					super.widgetSelected(e);
+    				}
     			});
     			new Label(propertiesPanel, SWT.NONE).setText("Sort");
     			refSortProperties = new PropertiesSelector<Property>(propertiesPanel, SWT.NONE);
     			refSortProperties.setTitle("");
-...
     					super.widgetSelected(e);
+    				}
     			});
     			new Label(propertiesPanel, SWT.NONE).setText("Size");
     			new Label(propertiesPanel, SWT.NONE);
     			leftSizeSpinner = new Spinner(propertiesPanel, SWT.BORDER);
-...
     		// Navigation Area: infoLine and buttons
     		GLComposite navigationAreaComposite = getBottomToolbar().installGLComposite("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));
-...
     	 */
     	public void updateEditorFromResult(boolean update) {
     		StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_56);
     		//if (true)// concordance==null || concordance.getQuery()!=query)
     		try {
     			CorporaView.refresh();
-...
     			QueriesView.refresh();
     			fillDisplayArea();
     			setPartName(concordance.getName());
     			queryWidget.memorize();
-...
     		return concordance.getNLinePerPage();
+    	}
     //	/**
     //	 * Update view properties label.
     //	 */
     //	void updateViewPropertiesLabel() {
     //		String str = StringUtils.join(concordance.getKeywordViewProperties(), "_");
     //		viewPropertiesLabel.setText(str);
     //		viewPropertiesLabel.getParent().layout();
     //		viewPropertiesLabel.update();
     //		queryArea.layout();
     //	}
     	//	/**
     	//	 * Update view properties label.
     	//	 */
     	//	void updateViewPropertiesLabel() {
     	//		String str = StringUtils.join(concordance.getKeywordViewProperties(), "_");
     	//		viewPropertiesLabel.setText(str);
     	//		viewPropertiesLabel.getParent().layout();
     	//		viewPropertiesLabel.update();
     	//		queryArea.layout();
     	//	}
     	/* (non-Javadoc)
     	 * @see org.eclipse.ui.part.EditorPart#getTitleToolTip()
-...
     	 * refresh column display accordingly to the views properties.
     	 */
     	private void refreshViewProperties() {
     			concordance.resetLines();
     			sort();
     		concordance.resetLines();
     		sort();
+    	}
     	/**
     	 * Refresh sort properties.
     	 */
     	private void refreshSortProperties() {
     			concordance.resetLines();
     			sort();
     		concordance.resetLines();
     		sort();
+    	}
     	/**
-...
     	public void setKeywordViewProperties(List<WordProperty> selectedViewProperties) {
     		concordance.setKeywordViewProperties(selectedViewProperties);
     		refreshViewProperties();
     //		updateViewPropertiesLabel();
     		//		updateViewPropertiesLabel();
+    	}
     	/**
-...
     	 */
     	public static class ConcordanceColumnSizeControlListener implements ControlListener {
     		private TableColumn column;
     		public ConcordanceColumnSizeControlListener(TableColumn column) {
     			this.column = column;
+    		}
     		@Override
     		public void controlMoved(ControlEvent e) { }
     		@Override
     		public void controlResized(ControlEvent e) {
     			if (column != null && !column.isDisposed() &&column.getWidth() < 5) {

              optional="true"/>
        <includes
              id="org.txm.treetagger.feature"
              version="0.0.0"
              optional="true"/>
        <includes
              id="org.txm.ahc.feature"
              version="0.0.0"
              optional="true"/>
-...
        <includes
              id="org.txm.chartsengine.jfreechart.feature"
              version="0.0.0"/>
              version="0.0.0"
              optional="true"/>
        <includes
              id="org.txm.chartsengine.r.feature"
              version="0.0.0"/>
              version="0.0.0"
              optional="true"/>
        <requires>
           <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>

     //
     package org.txm.rcp.views.debug;
     import org.eclipse.jface.viewers.CellLabelProvider;
     import org.eclipse.jface.viewers.DoubleClickEvent;
     import org.eclipse.jface.viewers.IDoubleClickListener;
     import org.eclipse.jface.viewers.ISelectionChangedListener;
     import org.eclipse.jface.viewers.ITreeContentProvider;
     import org.eclipse.jface.viewers.LabelProvider;
     import org.eclipse.jface.viewers.SelectionChangedEvent;
     import org.eclipse.jface.viewers.StructuredSelection;
     import org.eclipse.jface.viewers.TreeViewer;
     import org.eclipse.jface.viewers.TreeViewerColumn;
     import org.eclipse.jface.viewers.Viewer;
     import org.eclipse.jface.viewers.ViewerCell;
     import org.eclipse.swt.SWT;
     import org.eclipse.swt.custom.StyledText;
     import org.eclipse.swt.graphics.Color;
     import org.eclipse.swt.layout.FormData;
     import org.eclipse.swt.layout.GridData;
     import org.eclipse.swt.layout.GridLayout;
     import org.eclipse.swt.widgets.Button;
     import org.eclipse.swt.widgets.Composite;
     import org.eclipse.swt.widgets.Control;
     import org.eclipse.swt.widgets.Widget;
     import org.eclipse.swt.widgets.Label;
     import org.eclipse.swt.widgets.Layout;
     import org.eclipse.swt.widgets.ToolBar;
     import org.eclipse.ui.IPartListener;
     import org.eclipse.ui.IPartService;
     import org.eclipse.ui.IPropertyListener;
     import org.eclipse.ui.IWorkbenchPage;
     import org.eclipse.ui.IWorkbenchPart;
     import org.eclipse.ui.IWorkbenchWindow;
     import org.eclipse.ui.PlatformUI;
     import org.eclipse.ui.part.ViewPart;
     import org.txm.chartsengine.core.results.ChartResult;
     import org.txm.core.results.TXMResult;
     import org.txm.rcp.editors.TXMEditor;
     import org.txm.rcp.views.corpora.CorporaView;
     import org.txm.searchengine.cqp.corpus.Corpus;
     import org.txm.rcp.swt.GLComposite;
     /**
-...
     					return ((Composite)element).getChildren();
     				} else if (element instanceof Control) {
     					return new Object[0];
     				} else if (element instanceof ToolBar) {
     					return ((ToolBar)element).getChildren();
+    				}
     				return new Object[0];
+    			}
     		});
     		treeViewer.setLabelProvider(new LabelProvider() {
     			@Override
     			public final String getText(Object element) {
     				if (element instanceof Composite) {
     					Composite c = (Composite)element;
     					String s = c.toString()+" "+c.getLayout();
     					if (isHighlighted(c)) s += "*";
     					return s;
     				} else if (element instanceof Control) {
     					Control c = (Control)element;
     					String s = c.toString()+" ("+c.getToolTipText()+")";
     					if (isHighlighted(c)) s += "*";
     					return s;
+    				}
     //				else if (element instanceof Control) {
     //					return ((Composite)element).getLayout().getClass().getSimpleName();
     //				}
     				return element.toString();
+    			}
     		});
     		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
     			@Override
-...
     				treeViewer.refresh();
+    			}
     		});
     		treeViewer.getTree().setHeaderVisible(true);
     		treeViewer.getTree().setLinesVisible(true);
     		TreeViewerColumn nameColumn = new TreeViewerColumn(treeViewer, SWT.NONE);
     		nameColumn.getColumn().setText("Element");
     		nameColumn.getColumn().pack();
     		nameColumn.setLabelProvider(new CellLabelProvider() {
     			@Override
     			public void update(ViewerCell cell) {
     				Object element = cell.getElement();
     				if (element instanceof GLComposite) {
     					GLComposite c = (GLComposite)element;
     					String s = c.getName();
     					if (isHighlighted(c)) s += "*";
     					cell.setText(s);
     				} else if(element instanceof Button) {
     					Button c = (Button) element;
     					cell.setText(c.getClass().getSimpleName()+" '"+c.getText()+"'");
     				} else if(element instanceof Label) {
     					Label c = (Label) element;
     					cell.setText(c.getClass().getSimpleName()+" '"+c.getText()+"'");
     				} else {
     					cell.setText(element.getClass().getSimpleName());
+    				}
+    			}
     		});
     		TreeViewerColumn layoutColumn = new TreeViewerColumn(treeViewer, SWT.NONE);
     		layoutColumn.getColumn().setText("Layout");
     		layoutColumn.getColumn().pack();
     		layoutColumn.setLabelProvider(new CellLabelProvider() {
     			@Override
     			public void update(ViewerCell cell) {
     				Object element = cell.getElement();
     				if (element instanceof Composite) {
     					String s = getLayoutDetails(((Composite)element).getLayout());
     					cell.setText(s);
     				} else {
     					cell.setText("-");
+    				}
+    			}
     		});
     		TreeViewerColumn layoutDataColumn = new TreeViewerColumn(treeViewer, SWT.NONE);
     		layoutDataColumn.getColumn().setText("L-data");
     		layoutDataColumn.getColumn().pack();
     		layoutDataColumn.setLabelProvider(new CellLabelProvider() {
     			@Override
     			public void update(ViewerCell cell) {
     				Object element = cell.getElement();
     				if (element instanceof Control) {
     					String s = getLayoutDataDetails(((Control)element).getLayoutData());
     					cell.setText(s);
     				}else {
     					cell.setText("-");
+    				}
+    			}
     		});
+    	}
     	protected String getLayoutDataDetails(Object layoutData) {
     		if (layoutData == null) return "no layout data";
     		if (layoutData instanceof GridData) {
     			GridData data = (GridData)layoutData;
     			return "GD: "+data.heightHint+" "+data.widthHint
     					+" "+data.horizontalAlignment+" "+data.horizontalIndent+" "+data.horizontalSpan
     					+" "+data.minimumHeight+" "+data.minimumWidth
     					+" "+data.verticalAlignment+" "+data.verticalIndent+" "+data.verticalSpan;
     		} else if (layoutData instanceof FormData) {
     			FormData data = (FormData)layoutData;
     			return "GD: "+data.height+" "+data.width
     					+" "+data.width+" "+data.bottom+" "+data.left+" "+data.right+" "+data.top;
+    		}
     		return layoutData.toString();
+    	}
     	public static String getLayoutDetails(Layout layout) {
     		if (layout == null) return "no layout";
     		if (layout instanceof GridLayout) {
     			GridLayout gl = (GridLayout)layout;
     			return "GL: "+gl.horizontalSpacing+" "+gl.verticalSpacing+" "+gl.marginHeight+" "+gl.marginWidth
     					+"\n "+gl.marginBottom+" "+gl.marginLeft+" "+gl.marginRight+" "+gl.marginTop
     					+"\n "+gl.numColumns+" "+gl.makeColumnsEqualWidth;
     		} else {
     			return layout.toString();
+    		}
+    	}
     	@Override
     	public void partActivated(IWorkbenchPart part) {
     		if (part == null)
-...
     	@Override
     	public void setFocus() { }
     	public void refresh() {
     		if (!treeViewer.getTree().isDisposed()) {
     			treeViewer.refresh();
+    		}
+    	}
+    }

     package org.txm.rcp.views.debug;
     import org.eclipse.core.commands.ExecutionEvent;
     import org.eclipse.core.commands.ExecutionException;
     import org.eclipse.ui.IViewPart;
     import org.eclipse.ui.PartInitException;
     import org.txm.rcp.handlers.BaseAbstractHandler;
     public class RefreshDebugView extends BaseAbstractHandler {
     	@Override
     	public Object execute(ExecutionEvent event) throws ExecutionException {
     		try {
     			IViewPart view = getView(event, TXMEditorSWTDebugView.class.getName());
     			if (view != null && view instanceof TXMEditorSWTDebugView) {
     				((TXMEditorSWTDebugView)view).refresh();
+    			}
     		} catch (PartInitException e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
+    		}
     		return null;
+    	}
+    }

     import org.eclipse.core.commands.ParameterizedCommand;
     import org.eclipse.core.commands.common.NotDefinedException;
     import org.eclipse.swt.widgets.Event;
     import org.eclipse.ui.IViewPart;
     import org.eclipse.ui.IWorkbenchPage;
     import org.eclipse.ui.IWorkbenchWindow;
     import org.eclipse.ui.PartInitException;
     import org.eclipse.ui.PlatformUI;
     import org.eclipse.ui.commands.ICommandService;
     import org.eclipse.ui.handlers.IHandlerService;
-...
     		return getSelection(null);
+    	}
     	public static IViewPart getView(ExecutionEvent event, String id) throws PartInitException {
     		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
     		return page.showView(id);
+    	}
     	/**
     	 * Gets the current selected object.
     	 * @param event the ExecutionEvent that provoke the command call.

     import org.txm.rcp.messages.TXMUIMessages;
     import org.txm.rcp.swt.widget.ComplexSubcorpusPanel;
     import org.txm.rcp.swt.widget.QueryWidget;
     import org.txm.rcp.swt.widget.SimpleSubcorpusPanel;
     import org.txm.rcp.swt.widget.structures.SimpleSubcorpusPanel;
     import org.txm.searchengine.cqp.corpus.Corpus;
     import org.txm.searchengine.cqp.corpus.StructuralUnit;
     import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;

     	 */
     	public static final String CHARTS_EXPORT_DATA = "icons/functions/export_data.png"; //$NON-NLS-1$
     	public static final String PENCIL = "icons/functions/pencil.png"; //$NON-NLS-1$
     	public static final String PENCIL_ADD = "icons/functions/pencil_add.png"; //$NON-NLS-1$
     	public static final String PENCIL = "icons/functions/pencil.png"; //$NON-NLS-1$
     	public static final String PENCIL_SAVE = "icons/functions/pencil_save.png"; //$NON-NLS-1$
     	public static final String PENCIL_OPEN = "icons/functions/pencil_open.png"; //$NON-NLS-1$
     	public static final String PENCIL_CLOSE = "icons/functions/pencil_close.png"; //$NON-NLS-1$
     	public static final String ACTION_ADD = "icons/add.png";//$NON-NLS-1$
     	public static final String WORLD = "icons/world.png";

     	 */
     	private Composite parent;
     	private Composite topToolBarContainer;
     	private Composite topToolBarsContainer;
     	/**
     	 * contains the default bottom toolbars widget
-...
     	private GLComposite bottomSubWidgetsComposite;
     	private GLComposite firstLineComposite;
     	private boolean createPartControlDoneSucessfully = true; // for now... muahahaha
     	private GLComposite betweenTopToolbarsAndResultComposite;
     	public Shell getShell() {
-...
     			this.initParentLayout(parent, 1);
     			// contains the minimal panels and top toolbars
     			this.firstLineComposite = new GLComposite(parent, SWT.NONE);
     			this.firstLineComposite = new GLComposite(parent, SWT.NONE, "Editor first line");
     			this.firstLineComposite.getLayout().numColumns = 2;
     			this.firstLineComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
     			this.mainParametersComposite = new GLComposite(firstLineComposite, SWT.NONE);
     			this.mainParametersComposite = new GLComposite(firstLineComposite, SWT.NONE, "Main parameters area");
     			this.mainParametersComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
     			this.mainParametersComposite.getLayout().horizontalSpacing = 5;
     			// create the top tool bar
     			this.topToolBarContainer = new Composite(firstLineComposite, SWT.NONE);
     			this.topToolBarContainer.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
     			this.topToolBarsContainer = new Composite(firstLineComposite, SWT.NONE);
     			this.topToolBarsContainer.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
     			RowLayout rl = new RowLayout(SWT.HORIZONTAL);
     			rl = new RowLayout(SWT.HORIZONTAL);
     			rl.marginTop = rl.marginHeight = rl.marginWidth = rl.marginBottom = 0;
     			rl.center = true;
     			rl.spacing = 0;
     			this.topToolBarContainer.setLayout(rl);
     			this.topToolBarsContainer.setLayout(rl);
     			this.extendedParametersGroupsComposite = new GLComposite(parent, SWT.NONE);
     			if (parent.getLayout() instanceof GridLayout)	{
     				this.extendedParametersGroupsComposite.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+    			}
     			betweenTopToolbarsAndResultComposite = new GLComposite(parent, SWT.NONE, "Between Top toolbar and result area");
     			this.betweenTopToolbarsAndResultComposite.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
     			this.topToolBar = new TXMEditorToolBar(this, this.topToolBarContainer, this.extendedParametersGroupsComposite, SWT.FLAT | SWT.RIGHT, TOP_TOOLBAR_ID);
     			this.extendedParametersGroupsComposite = new GLComposite(betweenTopToolbarsAndResultComposite, SWT.NONE, "Extended parameters area");
     			this.extendedParametersGroupsComposite.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
     			this.topToolBar = new TXMEditorToolBar(this, this.topToolBarsContainer, this.extendedParametersGroupsComposite, SWT.FLAT | SWT.RIGHT, TOP_TOOLBAR_ID);
     			// FIXME: debug tests for see why there is an empty area at bottom of the toolbar
     			//this.topToolBar.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_RED));
-...
     			// display main area
     			this.resultArea = new GLComposite(parent, SWT.NONE);
     			this.resultArea = new GLComposite(parent, SWT.NONE, "Result area");
     			this.resultArea.setLayoutData(new GridData(GridData.FILL_BOTH));
     			// create the bottom tool bar
-...
     			this.bottomToolBarContainer.setLayout(rl);
     			this.bottomSubWidgetsComposite = new GLComposite(parent, SWT.NONE);
     			this.bottomSubWidgetsComposite = new GLComposite(parent, SWT.NONE, "Bottom parameters area");
     			if (parent.getLayout() instanceof GridLayout)	{
     				this.bottomSubWidgetsComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
+    			}
-...
     	 * @return the composite that contains the default Top toolbar.
     	 */
     	public Composite getTopToolbarContainer() {
     		return topToolBarContainer;
     		return topToolBarsContainer;
+    	}
     	/**
     	 * Use this composite if you need to insert widget between the toptoolbars container and the result area
     	 * @return
     	 */
     	public GLComposite getBetweenTopToolbarsAndResultComposite() {
     		return betweenTopToolbarsAndResultComposite;
+    	}
     	/**
     	 * Use this method to add widget next to the default Bottom toolbar
+    	 *
     	 * @return the composite that contains the default Bottom toolbar.

     			this.browser = browser;
+    		}
     		public Object function (Object[] arguments) {
     			if (arguments.length == 0) return null;
     			HashMap<String, String> params = new HashMap<String, String>();
     			for (int i = 0 ; i < arguments.length ; i += 2) {
     				params.put(arguments[i].toString(), arguments[i+1].toString());
-...
     			String id = params.get("id");
     			if (id != null) {
     				params.remove("id");
     				System.out.println("CALLING CMD with id="+id+" and parameters="+params);
     				//System.out.println("CALLING CMD with id="+id+" and parameters="+params);
     				//get the command from plugin.xml
     				IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
     				ICommandService cmdService = (ICommandService)window.getService(ICommandService.class);

     import java.util.HashMap;
     import org.eclipse.jface.action.ToolBarManager;
     import org.eclipse.jface.fieldassist.ControlDecoration;
     import org.eclipse.swt.SWT;
     import org.eclipse.swt.events.SelectionEvent;
     import org.eclipse.swt.events.SelectionListener;
     import org.eclipse.swt.graphics.Image;
     import org.eclipse.swt.layout.GridData;
     import org.eclipse.swt.layout.RowLayout;
     import org.eclipse.swt.widgets.Button;
     import org.eclipse.swt.widgets.Composite;
     import org.eclipse.swt.widgets.Control;
     import org.eclipse.swt.widgets.Event;
     import org.eclipse.swt.widgets.Group;
     import org.eclipse.swt.widgets.Listener;
     import org.eclipse.swt.widgets.MenuItem;
     import org.eclipse.swt.widgets.ToolBar;
     import org.eclipse.swt.widgets.ToolItem;
     import org.eclipse.ui.menus.IMenuService;
     import org.txm.core.results.TXMResult;
     import org.txm.rcp.IImageKeys;
     import org.txm.rcp.swt.GLComposite;
     import org.txm.rcp.swt.toolbar.DropDownCheckToolItem;
     import org.txm.rcp.swt.toolbar.DropDownToolItem;
     import org.txm.rcp.swt.toolbar.OpenCloseToolItem;
     /**
+     *
-...
     	/**
     	 * Contains references to installed groups to ToolItem.
     	 */
     	private HashMap<String, OpenCloseButton> buttons = new HashMap<String, OpenCloseButton>();
     	private HashMap<String, ToolItem> buttons = new HashMap<String, ToolItem>();
     	/**
+    	 *
-...
     	public void setVisible(String id, boolean visible)	{
     		if (groups.containsKey(id) && !groups.get(id).isDisposed()) {
     			Composite composite = groups.get(id);
     			OpenCloseButton activationButton = buttons.get(id);
     			setVisible(composite, activationButton, visible);
     			setVisible(composite, visible);
+    		}
+    	}
-...
     	 * @param composite
+    	 *
     	 */
     	protected void setVisible(Composite composite, OpenCloseButton showParameters, boolean visible)	{
     	protected void setVisible(Composite composite, boolean visible)	{
     		((GridData)composite.getLayoutData()).exclude = !visible;
     		composite.setVisible(visible);
     		subWidgetComposite.layout(true);
     		composite.layout(true);
     		editorPart.layout(true);
     		showParameters.setSelection(visible);
+    	}
-...
     		if (this.groups.containsKey(groupTitle)) {
     			return (GLComposite) this.groups.get(groupTitle);
+    		}
     		final GLComposite comp = new GLComposite(subWidgetComposite, SWT.NONE);
     		final GLComposite comp = new GLComposite(subWidgetComposite, SWT.NONE, "Group: "+groupTitle);
     		comp.getLayout().numColumns = numColumns;
     		comp.getLayout().makeColumnsEqualWidth = makeColumnsEqualWidth;
     		return comp;
+    	}
     	/**
     	 * Creates a group with a dropdown button and multiple modes
     	 * @param groupTitle
     	 * @param buttonToolTip
     	 * @param openIconFilePath
     	 * @param closeIconFilePath
     	 * @param showGroup
     	 * @param selectionListener
     	 * @param modes The modes names
     	 * @param choicesSelectionListeners the corresponding mode selectionListener
     	 */
     	public Group installAlternativesGroup(final String groupTitle, String buttonToolTip, String openIconFilePath, String closeIconFilePath, boolean showGroup,
     			SelectionListener selectionListener, String[] modes, SelectionListener[] modeSelectionListeners) {
     		final DropDownCheckToolItem openCloseButton = new DropDownCheckToolItem(this, buttonToolTip, openIconFilePath, closeIconFilePath);
     		openCloseButton.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				if (e.doit) {
     					setVisible(groupTitle, openCloseButton.getSelection());
+    				}
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) { }
     		});
     		org.txm.rcp.swt.listeners.DropdownSelectionListener listenerOne = openCloseButton.getDropDownListener();
     		listenerOne.setDefaultSelectionListener(selectionListener);
     		for (int i = 0 ; i < modes.length && i < modeSelectionListeners.length; i++) {
     			MenuItem item1 = new MenuItem(listenerOne.getMenu(), SWT.PUSH);
     			item1.setText(modes[i]);
     			item1.addSelectionListener(modeSelectionListeners[i]);
+    		}
     		final Group group = new Group(subWidgetComposite, SWT.NONE);
     		group.setText(groupTitle);
     		GridData gd2 = new GridData(GridData.FILL_BOTH);
     		gd2.grabExcessVerticalSpace = false;
     		gd2.grabExcessHorizontalSpace = true;
     		gd2.exclude = true;
     		group.setLayoutData(gd2);
     		this.groups.put(groupTitle, group);
     		this.buttons.put(groupTitle, openCloseButton);
     		return group;
+    	}
     	/**
     	 * Creates a <code>Group</code> with some configuration to make it visible/invisible and a <code>ToolItem</code> attached to the specified tool bar to show/hide this group.
+    	 *
     	 * @param composite
-...
     		group.setLayoutData(gd2);
     		group.setVisible(false);
     		// add finally a button to the toolbar to show/hide the Group
     		final OpenCloseButton showParameters = new OpenCloseButton(this, groupTitle, openIconFilePath, closeIconFilePath);
     		final OpenCloseToolItem showParameters = new OpenCloseToolItem(this, groupTitle, openIconFilePath, closeIconFilePath);
     		//		if (iconFilePath != null)	{
     		//			showParameters.setImage(IImageKeys.getImage(iconFilePath));
     		//		}
-...
     		//			showParameters.setToolTipText(buttonToolTip);
     		//		}
     		this.setVisible(group, showParameters, showGroup); // default init
     		this.setVisible(group, showGroup); // default init
     		showParameters.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				setVisible(group, showParameters, showParameters.getSelection());
     				setVisible(group, showParameters.getSelection());
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) { }
     		});
     		//TODO add an optional selection listener
     		//showParameters.addSelectionListener(selectionListener);
     		this.groups.put(groupTitle, group);
     		this.buttons.put(groupTitle, showParameters);
     		return group;
+    	}
     	//failure of open/close decorator
     	public class OpenCloseButton {
     		//		ToolItem sep;
     		ToolItem showParameters;
     		//		ControlDecoration openCloseDeco;
     		protected Image openIcon;
     		protected Image closeIcon;
     		public OpenCloseButton(TXMEditorToolBar toolbar, String groupTitle, String openIconFilePath, String closeIconFilePath) {
     			//			sep = new ToolItem(toolbar, SWT.SEPARATOR);
     			showParameters = new ToolItem(toolbar, SWT.CHECK);
     			if (openIconFilePath != null) {
     				openIcon = IImageKeys.getImage(openIconFilePath);
     				showParameters.setImage(openIcon);
     				showParameters.setToolTipText(groupTitle);
     				if (closeIconFilePath != null) {
     					closeIcon = IImageKeys.getImage(closeIconFilePath);
+    				}
     			} else {
     				showParameters.setText(groupTitle);
+    			}
     			//			showParameters.pack();
     			//			sep.setWidth (showParameters.getSize ().x);
     			//			sep.setControl (showParameters);
     			//			openCloseDeco = new ControlDecoration(showParameters, SWT.RIGHT);
     			//			openCloseDeco.setImage(IImageKeys.getImage(IImageKeys.CLOSE_DECORATOR));
+    		}
     		public void setSelection(boolean visible) {
     			showParameters.setSelection(visible);
     			if (closeIcon != null) {
     				if (visible) {
     					showParameters.setImage(closeIcon);
     				} else {
     					showParameters.setImage(openIcon);
+    				}
+    			}
+    		}
     		public void addSelectionListener(SelectionListener selectionListener) {
     			showParameters.addSelectionListener(selectionListener);
+    		}
     		public boolean getSelection() {
     			return showParameters.getSelection();
+    		}
     		public void setToolTipText(String buttonToolTip) {
     			showParameters.setToolTipText(buttonToolTip);
+    		}
     		public void setText(String groupTitle) {
     			showParameters.setText(groupTitle);
+    		}
     		public void setImage(Image image) {
     			showParameters.setImage(image);
+    		}
     		public void dispose() {
     			showParameters.dispose();
+    		}
     		public Composite getParent() {
     			return showParameters.getParent();
+    		}
+    	}
     	public void unInstallGroup(String groupTitle) {
     		if (this.groups.containsKey(groupTitle)) {
     			this.groups.get(groupTitle).dispose();
-...
+    		}
+    	}
     	public OpenCloseButton getGroupButton(String groupTitle) {
     	public ToolItem getGroupButton(String groupTitle) {
     		return this.buttons.get(groupTitle);
+    	}
+    }

     package org.txm.rcp.swt.widget;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.List;
     import org.eclipse.jface.dialogs.IDialogConstants;
     import org.eclipse.jface.viewers.ArrayContentProvider;
     import org.eclipse.jface.viewers.ISelection;
     import org.eclipse.jface.viewers.IStructuredSelection;
     import org.eclipse.jface.viewers.ListViewer;
     import org.eclipse.swt.SWT;
     import org.eclipse.swt.events.SelectionEvent;
     import org.eclipse.swt.events.SelectionListener;
     import org.eclipse.swt.layout.GridData;
     import org.eclipse.swt.layout.GridLayout;
     import org.eclipse.swt.widgets.Combo;
     import org.eclipse.swt.widgets.Composite;
     import org.eclipse.swt.widgets.Label;
     import org.txm.rcp.actions.CreateSubcorpusDialog;
     import org.txm.rcp.messages.TXMUIMessages;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.Corpus;
     import org.txm.searchengine.cqp.corpus.StructuralUnit;
     import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
     import org.txm.utils.logger.Log;
     public class SimpleSubcorpusPanel extends Composite {
     	public StructuralUnit selectedStructuralUnit;
     	public StructuralUnitProperty selectedStructuralUnitProperty;
     	public List<String> selectedValues;
     	public List<StructuralUnitProperty> selectableStructuralUnitProperties = null;
     	Combo structuralUnitsCombo;
     	Combo propertyCombo;
     	ListViewer valueCombo;
     	List<StructuralUnit> structuralUnitsFinal;
     	private CreateSubcorpusDialog dialog;
     	private Corpus corpus;
     	public SimpleSubcorpusPanel(Composite parent, int style, CreateSubcorpusDialog dialog, Corpus corpus) {
     		super(parent, style);
     		this.dialog = dialog;
     		this.corpus = corpus;
     		GridLayout layout = new GridLayout(2, false);
     		this.setLayout(layout);
     		Label structureLabel = new Label(this, SWT.NONE);
     		structureLabel.setText(TXMUIMessages.CreatePartitionDialog_2);
     		structureLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
     		structuralUnitsCombo = new Combo(this, SWT.READ_ONLY);
     		structuralUnitsCombo.setLayoutData(new GridData(GridData.FILL,GridData.FILL, true, false));
     		Label propertyLabel = new Label(this, SWT.NONE);
     		propertyLabel.setText(TXMUIMessages.CreatePartitionDialog_4);
     		propertyLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
     				false, false));
     		propertyCombo = new Combo(this, SWT.READ_ONLY);
     		propertyCombo.setLayoutData(new GridData(GridData.FILL,GridData.FILL, true, false));
     		Label valuesLabel = new Label(this, SWT.NONE);
     		valuesLabel.setText(TXMUIMessages.CreateSubcorpusDialog_6);
     		valuesLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
     		valueCombo = new ListViewer(this, SWT.MULTI |SWT.V_SCROLL | SWT.BORDER | SWT.VIRTUAL);
     		valueCombo.setContentProvider(new ArrayContentProvider());
     //		valueCombo.setLabelProvider(new LabelProvider() {
     //
     //	        @Override
     //	        public String getText(Object element) {
     //	            return Activator.getSomeService().key2Value((Integer) element);
     //	        }
     //
     //	    });
     		GridData data = new GridData(GridData.FILL,GridData.FILL, true, false);
     		data.heightHint = 100;
     		valueCombo.getList().setLayoutData(data);
     		// Load StructuralUnit
     		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     		List<StructuralUnit> structuralUnits = null;
     		try {
     			structuralUnits = corpus.getOrderedStructuralUnits();
     		} catch (Exception e) {
     			Log.severe(TXMUIMessages.ERROR
     					+ Log.toString(e));
     			return;
+    		}
     		structuralUnitsFinal = new ArrayList<StructuralUnit>();
     		for (StructuralUnit unit : structuralUnits) {
     			if (unit.getOrderedProperties() != null
     					&& unit.getOrderedProperties().size() != 0) {
     				if (!"txmcorpus".equals(unit.getName())) { // keep all but txmcorpus //$NON-NLS-1$
     					structuralUnitsFinal.add(unit);
     					structuralUnitsCombo.add(unit.getName());
+    				}
+    			}
+    		}
     		if (structuralUnitsCombo.getItemCount() == 0) {
     			dialog.getButton(IDialogConstants.OK_ID).setEnabled(false);
     		} else {
     			String[] items = structuralUnitsCombo.getItems();
     			structuralUnitsCombo.select(0);
     			for (int i = 0 ; i < items.length ; i++)
     				if (items[i].equals("text")) { //$NON-NLS-1$
     					structuralUnitsCombo.select(i);
     					break;
+    				}
     			selectedStructuralUnit = structuralUnitsFinal.get(0);
+    		}
     		// Load StructuralUnitProperty
     		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     		structuralUnitsCombo.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			@Override
     			public void widgetSelected(SelectionEvent event) {
     				System.out.println(TXMUIMessages.SimpleSubcorpusPanel_0);
     				reloadProperties();
+    			}
     		});
     		/*
     		 * for(StructuralUnitProperty property :
     		 * structuralUnitsFinal.get(0).getProperties()) {
     		 * propertyCombo.add(property.getName()); }
+    		 *
     		 * propertyCombo.select(0); selectedStructuralUnitProperty =
     		 * selectedStructuralUnit.getProperties().get(0);
     		 */
     		// Load Values
     		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     		propertyCombo.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			@Override
     			public void widgetSelected(SelectionEvent event) {
     				reloadValues();
+    			}
     		});
     		valueCombo.getList().addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				ISelection sel = valueCombo.getSelection();
     				if (sel instanceof IStructuredSelection) {
     					selectedValues = ((IStructuredSelection)sel).toList();
+    				}
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
     				// TODO Auto-generated method stub
+    			}
     		});
     		reloadProperties();
+    	}
     	/**
     	 * Reload values.
     	 */
     	protected void reloadValues() {
     		List<String> values = null;
     		selectedStructuralUnitProperty = selectableStructuralUnitProperties
     				.get(propertyCombo.getSelectionIndex());
     		//System.out.println("Selectable su prop: "+selectableStructuralUnitProperties); //$NON-NLS-1$
     		//System.out.println("Selected line: "+propertyCombo.getSelectionIndex()); //$NON-NLS-1$
     		//System.out.println("Combo values: "+Arrays.toString(propertyCombo.getItems())); //$NON-NLS-1$
     		//System.out.println("Selected su prop: "+selectedStructuralUnitProperty); //$NON-NLS-1$
     		try {
     			values = selectedStructuralUnitProperty.getOrderedValues(corpus);
     			Collections.sort(values);
     		} catch (CqiClientException e) {
     			Log.severe(TXMUIMessages.ERROR
     					+ Log.toString(e));
     			return;
+    		}
     		valueCombo.setInput(values);
     		if (valueCombo.getList().getItemCount() > 0) {
     			valueCombo.getList().select(0);
     			selectedValues = new ArrayList<String>();
     			selectedValues.add(valueCombo.getList().getItem(0));
+    		}
     		GridData data = new GridData(GridData.FILL_BOTH);
     		data.heightHint = 10 * valueCombo.getList().getItemHeight();
     		valueCombo.getList().setLayoutData(data);
     		valueCombo.getList().getParent().layout();
+    	}
     	/**
     	 * Reload properties.
     	 */
     	protected void reloadProperties() {
     		selectedStructuralUnit = structuralUnitsFinal.get(structuralUnitsCombo
     				.getSelectionIndex());
     		selectableStructuralUnitProperties =
     				new ArrayList<StructuralUnitProperty>(selectedStructuralUnit.getOrderedProperties());
     		for (int i = 0 ; i < selectableStructuralUnitProperties.size() ; i++) {
     			StructuralUnitProperty property = selectableStructuralUnitProperties.get(i);
     			if ("text_base".equals(property.getFullName()) || //$NON-NLS-1$
     					"text_project".equals(property.getFullName())) //$NON-NLS-1$
     				selectableStructuralUnitProperties.remove(i);
+    		}
     		propertyCombo.removeAll();
     		for (StructuralUnitProperty property : selectableStructuralUnitProperties) {
     			propertyCombo.add(property.getName());
+    		}
     		if (selectedStructuralUnit.getName().equals("text")) { //$NON-NLS-1$
     			String[] items = propertyCombo.getItems();
     			for (int i = 0 ; i < items.length ; i++) {
     				if (items[i].equals("id")) { //$NON-NLS-1$
     					propertyCombo.select(i);
     					break;
+    				}
+    			}
     		} else {
     			propertyCombo.select(0);
+    		}
     		reloadValues();
+    	}
+    }

     	 * @param style the style
     	 */
     	public NavigationWidget(Composite parent, int style) {
     		super(parent, style);
     		super(parent, style, "Navigation");
     		this.getLayout().numColumns = 6;
     		this.getLayout().makeColumnsEqualWidth = false;

     package org.txm.rcp.swt.widget.structures;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.List;
     import org.eclipse.jface.dialogs.IDialogConstants;
     import org.eclipse.jface.viewers.ArrayContentProvider;
     import org.eclipse.jface.viewers.ISelection;
     import org.eclipse.jface.viewers.IStructuredSelection;
     import org.eclipse.jface.viewers.ListViewer;
     import org.eclipse.swt.SWT;
     import org.eclipse.swt.events.SelectionEvent;
     import org.eclipse.swt.events.SelectionListener;
     import org.eclipse.swt.layout.GridData;
     import org.eclipse.swt.layout.GridLayout;
     import org.eclipse.swt.widgets.Combo;
     import org.eclipse.swt.widgets.Composite;
     import org.eclipse.swt.widgets.Label;
     import org.txm.rcp.actions.CreateSubcorpusDialog;
     import org.txm.rcp.messages.TXMUIMessages;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.Corpus;
     import org.txm.searchengine.cqp.corpus.StructuralUnit;
     import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
     import org.txm.utils.logger.Log;
     public class SimpleSubcorpusPanel extends Composite {
     	public StructuralUnit selectedStructuralUnit;
     	public StructuralUnitProperty selectedStructuralUnitProperty;
     	public List<String> selectedValues;
     	public List<StructuralUnitProperty> selectableStructuralUnitProperties = null;
     	Combo structuralUnitsCombo;
     	Combo propertyCombo;
     	ListViewer valueCombo;
     	List<StructuralUnit> structuralUnitsFinal;
     	private CreateSubcorpusDialog dialog;
     	private Corpus corpus;
     	public SimpleSubcorpusPanel(Composite parent, int style, CreateSubcorpusDialog dialog, Corpus corpus) {
     		super(parent, style);
     		this.dialog = dialog;
     		this.corpus = corpus;
     		GridLayout layout = new GridLayout(2, false);
     		this.setLayout(layout);
     		Label structureLabel = new Label(this, SWT.NONE);
     		structureLabel.setText(TXMUIMessages.CreatePartitionDialog_2);
     		structureLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
     		structuralUnitsCombo = new Combo(this, SWT.READ_ONLY);
     		structuralUnitsCombo.setLayoutData(new GridData(GridData.FILL,GridData.FILL, true, false));
     		Label propertyLabel = new Label(this, SWT.NONE);
     		propertyLabel.setText(TXMUIMessages.CreatePartitionDialog_4);
     		propertyLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
     				false, false));
     		propertyCombo = new Combo(this, SWT.READ_ONLY);
     		propertyCombo.setLayoutData(new GridData(GridData.FILL,GridData.FILL, true, false));
     		Label valuesLabel = new Label(this, SWT.NONE);
     		valuesLabel.setText(TXMUIMessages.CreateSubcorpusDialog_6);
     		valuesLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
     		valueCombo = new ListViewer(this, SWT.MULTI |SWT.V_SCROLL | SWT.BORDER | SWT.VIRTUAL);
     		valueCombo.setContentProvider(new ArrayContentProvider());
     //		valueCombo.setLabelProvider(new LabelProvider() {
     //
     //	        @Override
     //	        public String getText(Object element) {
     //	            return Activator.getSomeService().key2Value((Integer) element);
     //	        }
     //
     //	    });
     		GridData data = new GridData(GridData.FILL,GridData.FILL, true, false);
     		data.heightHint = 100;
     		valueCombo.getList().setLayoutData(data);
     		// Load StructuralUnit
     		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     		List<StructuralUnit> structuralUnits = null;
     		try {
     			structuralUnits = corpus.getOrderedStructuralUnits();
     		} catch (Exception e) {
     			Log.severe(TXMUIMessages.ERROR
     					+ Log.toString(e));
     			return;
+    		}
     		structuralUnitsFinal = new ArrayList<StructuralUnit>();
     		for (StructuralUnit unit : structuralUnits) {
     			if (unit.getOrderedProperties() != null
     					&& unit.getOrderedProperties().size() != 0) {
     				if (!"txmcorpus".equals(unit.getName())) { // keep all but txmcorpus //$NON-NLS-1$
     					structuralUnitsFinal.add(unit);
     					structuralUnitsCombo.add(unit.getName());
+    				}
+    			}
+    		}
     		if (structuralUnitsCombo.getItemCount() == 0) {
     			dialog.getButton(IDialogConstants.OK_ID).setEnabled(false);
     		} else {
     			String[] items = structuralUnitsCombo.getItems();
     			structuralUnitsCombo.select(0);
     			for (int i = 0 ; i < items.length ; i++)
     				if (items[i].equals("text")) { //$NON-NLS-1$
     					structuralUnitsCombo.select(i);
     					break;
+    				}
     			selectedStructuralUnit = structuralUnitsFinal.get(0);
+    		}
     		// Load StructuralUnitProperty
     		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     		structuralUnitsCombo.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			@Override
     			public void widgetSelected(SelectionEvent event) {
     				System.out.println(TXMUIMessages.SimpleSubcorpusPanel_0);
     				reloadProperties();
+    			}
     		});
     		/*
     		 * for(StructuralUnitProperty property :
     		 * structuralUnitsFinal.get(0).getProperties()) {
     		 * propertyCombo.add(property.getName()); }
+    		 *
     		 * propertyCombo.select(0); selectedStructuralUnitProperty =
     		 * selectedStructuralUnit.getProperties().get(0);
     		 */
     		// Load Values
     		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     		propertyCombo.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
+    			}
     			@Override
     			public void widgetSelected(SelectionEvent event) {
     				reloadValues();
+    			}
     		});
     		valueCombo.getList().addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				ISelection sel = valueCombo.getSelection();
     				if (sel instanceof IStructuredSelection) {
     					selectedValues = ((IStructuredSelection)sel).toList();
+    				}
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
     				// TODO Auto-generated method stub
+    			}
     		});
     		reloadProperties();
+    	}

Laboratoire ICAR » Plateforme TXM

Révision 837