Attachment #199831 for bug #340876

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.jdt.ui; singleton:=true	4	Bundle-SymbolicName: org.eclipse.jdt.ui; singleton:=true
5	Bundle-Version: 3.7.0.qualifier	5	Bundle-Version: 3.7.1.qualifier
6	Bundle-Activator: org.eclipse.jdt.internal.ui.JavaPlugin	6	Bundle-Activator: org.eclipse.jdt.internal.ui.JavaPlugin
7	Bundle-ActivationPolicy: lazy	7	Bundle-ActivationPolicy: lazy
8	Bundle-Vendor: %providerName	8	Bundle-Vendor: %providerName




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.javaeditor;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import org.eclipse.core.runtime.Assert;


import org.eclipse.jdt.internal.ui.text.java.CompletionProposalComputerRegistry;

/**
 * A content assist executor can invoke content assist for a specific proposal category on an
 * editor.
 * 
 * @since 3.2
 */
public final class SpecificContentAssistExecutor {


	/**
	 * Creates a new executor.
	 * 
	 * @param registry the computer registry to use for the enablement of proposal categories
	 */
	public SpecificContentAssistExecutor(CompletionProposalComputerRegistry registry) {

	/**
	 * Invokes content assist on <code>editor</code>, showing only proposals computed by the
	 * <code>CompletionProposalCategory</code> with the given <code>categoryId</code>.
	 * 
	 * @param editor the editor to invoke code assist on
	 * @param categoryId the id of the proposal category to show proposals for
	 */
	public void invokeContentAssist(final ITextEditor editor, String categoryId) {
		Collection<CompletionProposalCategory> categories= fRegistry.getProposalCategories();
		ArrayList<Set<Integer>> categoriesState= new ArrayList<Set<Integer>>(categories.size());
		for (CompletionProposalCategory cat : categories) {
			categoriesState.add(new HashSet<Integer>(cat.getProposalListIndices()));
			cat.clearProposalListIndices();
			if (cat.getId().equals(categoryId))
				cat.addProposalListIndex(Integer.valueOf(0));
			cat.setIncluded(cat.getId().equals(categoryId));
			separateState[i]= cat.isSeparateCommand();
			cat.setSeparateCommand(false);
		}

		try {

			if (target != null && target.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS))
				target.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
		} finally {
			int i= 0;
			for (Iterator<CompletionProposalCategory> it= categories.iterator(); it.hasNext(); i++) {
				CompletionProposalCategory cat= it.next();
				cat.clearProposalListIndices();
				cat.addAllProposalListIndices(categoriesState.get(i));
			}
		}
	}




/*******************************************************************************
 * Copyright (c) 2005, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.preferences;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
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.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;

import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.CommandManager;
import org.eclipse.core.commands.IParameter;
import org.eclipse.core.commands.Parameterization;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.commands.contexts.ContextManager;

import org.eclipse.core.runtime.Assert;

import org.eclipse.jface.bindings.BindingManager;
import org.eclipse.jface.bindings.Scheme;
import org.eclipse.jface.bindings.TriggerSequence;
import org.eclipse.jface.layout.PixelConverter;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.ViewerComparator;

import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.keys.IBindingService;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;

import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;

import org.eclipse.jdt.core.JavaCore;

import org.eclipse.jdt.internal.corext.util.Messages;

import org.eclipse.jdt.ui.PreferenceConstants;

import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
import org.eclipse.jdt.internal.ui.text.java.CompletionProposalCategory;
import org.eclipse.jdt.internal.ui.text.java.CompletionProposalComputerRegistry;
import org.eclipse.jdt.internal.ui.util.SWTUtil;
import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;


/**
 *
 * @since 3.2
 */
final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlock {

	private static final Key PREF_EXCLUDED_CATEGORIES= getJDTUIKey(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES);
	private static final Key PREF_CATEGORY_ORDER= getJDTUIKey(PreferenceConstants.CODEASSIST_CATEGORY_ORDER);
	private static final Key PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC= getJDTCoreKey(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC);

	private static Key[] getAllKeys() {
		return new Key[] {
				PREF_EXCLUDED_CATEGORIES,
				PREF_CATEGORY_ORDER,
				PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC
		};
	}

	private final class DefaultTableLabelProvider extends LabelProvider implements ITableLabelProvider {

		/*
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
		 */
		public Image getColumnImage(Object element, int columnIndex) {
			if (columnIndex == 0)
				return ((ModelElement) element).getImage();
			return null;
		}

		/*
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
		 */
		public String getColumnText(Object element, int columnIndex) {
			switch (columnIndex) {
	            case 0:
	            	return ((ModelElement) element).getName();
	            case 1:
	            	return ((ModelElement) element).getKeybindingAsString();
	            default:
	            	Assert.isTrue(false);
	            	return null;
            }
		}

		/*
		 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
		 */
		@Override
		public String getText(Object element) {
		    return getColumnText(element, 0); // needed to make the sorter work
		}
	}

	private final class SeparateTableLabelProvider extends LabelProvider implements ITableLabelProvider {

		/*
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
		 */
		public Image getColumnImage(Object element, int columnIndex) {
			if (columnIndex == 0)
				return ((ModelElement) element).getImage();
			return null;
		}

		/*
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
		 */
		public String getColumnText(Object element, int columnIndex) {
			switch (columnIndex) {
				case 0:
					return ((ModelElement) element).getName();
				default:
					Assert.isTrue(false);
				return null;
			}
		}
	}

	private final Comparator<ModelElement> fCategoryComparator= new Comparator<ModelElement>() {
		private int getRank(ModelElement o) {
			return o.getRank();
		}

		public int compare(ModelElement o1, ModelElement o2) {
			return getRank(o1) - getRank(o2);
		}
	};

	private final class PreferenceModel {
		private static final int LIMIT= 65535;
		private static final String COLON= ":"; //$NON-NLS-1$
		private static final String SEPARATOR= "\0"; //$NON-NLS-1$

		private final List<ModelElement> fElements;
		/**
		 * The read-only list of elements.
		 */
		final List<ModelElement> elements;

		public PreferenceModel(CompletionProposalComputerRegistry registry) {
			List<CompletionProposalCategory> categories= registry.getProposalCategories();
			fElements= new ArrayList<ModelElement>();
			for (Iterator<CompletionProposalCategory> it= categories.iterator(); it.hasNext();) {
				CompletionProposalCategory category= it.next();
				if (category.hasComputers()) {
					fElements.add(new ModelElement(category, this));
				}
			}
			Collections.sort(fElements, fCategoryComparator);
			elements= Collections.unmodifiableList(fElements);
		}

        public void moveUp(ModelElement category) {
        	int index= fElements.indexOf(category);
			if (index > 0) {
				ModelElement item= fElements.remove(index);
				fElements.add(index - 1, item);
				writeOrderPreference(null, false);
			}
        }

        public void moveDown(ModelElement category) {
        	int index= fElements.indexOf(category);
			if (index < fElements.size() - 1) {
				ModelElement item= fElements.remove(index);
				fElements.add(index + 1, item);
				writeOrderPreference(null, false);
			}
        }

    	private void writeInclusionPreference(ModelElement changed, boolean isInDefaultCategory) {
    		StringBuffer buf= new StringBuffer();
    		for (Iterator<ModelElement> it= fElements.iterator(); it.hasNext();) {
    			ModelElement item= it.next();
    			boolean included= changed == item ? isInDefaultCategory : item.isInDefaultCategory();
    			if (!included)
    				buf.append(item.getId() + SEPARATOR);
    		}

    		String newValue= buf.toString();
    		String oldValue= setValue(PREF_EXCLUDED_CATEGORIES, newValue);
    		validateSettings(PREF_EXCLUDED_CATEGORIES, oldValue, newValue);
    	}

    	private void writeOrderPreference(ModelElement changed, boolean isSeparate) {
    		StringBuffer buf= new StringBuffer();
    		int i= 0;
    		for (Iterator<ModelElement> it= fElements.iterator(); it.hasNext(); i++) {
    			ModelElement item= it.next();
    			boolean separate= changed == item ? isSeparate : item.isSeparateCommand();
    			int rank= separate ? i : i + LIMIT;
    			buf.append(item.getId() + COLON + rank + SEPARATOR);
    		}

    		String newValue= buf.toString();
    		String oldValue= setValue(PREF_CATEGORY_ORDER, newValue);
    		validateSettings(PREF_CATEGORY_ORDER, oldValue, newValue);
    	}


    	private boolean readInclusionPreference(CompletionProposalCategory cat) {
    		String[] ids= getTokens(getValue(PREF_EXCLUDED_CATEGORIES), SEPARATOR);
    		for (int i= 0; i < ids.length; i++) {
    			if (ids[i].equals(cat.getId()))
    				return false;
    		}
    		return true;
    	}

    	private int readOrderPreference(CompletionProposalCategory cat) {
    		String[] sortOrderIds= getTokens(getValue(PREF_CATEGORY_ORDER), SEPARATOR);
    		for (int i= 0; i < sortOrderIds.length; i++) {
    			String[] idAndRank= getTokens(sortOrderIds[i], COLON);
    			if (idAndRank[0].equals(cat.getId()))
    				return Integer.parseInt(idAndRank[1]);
    		}
			return LIMIT - 1;
    	}

        public void update() {
			Collections.sort(fElements, fCategoryComparator);
        }
	}

	private final class ModelElement {
		private final CompletionProposalCategory fCategory;
		private final Command fCommand;
		private final IParameter fParam;
		private final PreferenceModel fPreferenceModel;

		ModelElement(CompletionProposalCategory category, PreferenceModel model) {
			fCategory= category;
			ICommandService commandSvc= (ICommandService) PlatformUI.getWorkbench().getAdapter(ICommandService.class);
			fCommand= commandSvc.getCommand("org.eclipse.jdt.ui.specific_content_assist.command"); //$NON-NLS-1$
			IParameter type;
			try {
				type= fCommand.getParameters()[0];
			} catch (NotDefinedException x) {
				Assert.isTrue(false);
				type= null;
			}
			fParam= type;
			fPreferenceModel= model;
		}
		Image getImage() {
			return CodeAssistAdvancedConfigurationBlock.this.getImage(fCategory.getImageDescriptor());
		}
		String getName() {
			return fCategory.getDisplayName();
		}
		String getKeybindingAsString() {
			final Parameterization[] params= { new Parameterization(fParam, fCategory.getId()) };
			final ParameterizedCommand pCmd= new ParameterizedCommand(fCommand, params);
			String key= getKeyboardShortcut(pCmd);
			return key;
		}
		boolean isInDefaultCategory() {
			return fPreferenceModel.readInclusionPreference(fCategory);
		}
		void setInDefaultCategory(boolean included) {
			if (included != isInDefaultCategory())
				fPreferenceModel.writeInclusionPreference(this, included);
		}
		String getId() {
			return fCategory.getId();
		}
		int getRank() {
			int rank= getInternalRank();
			if (rank > PreferenceModel.LIMIT)
				return rank - PreferenceModel.LIMIT;
			return rank;
		}
		void moveUp() {
			fPreferenceModel.moveUp(this);
		}
		void moveDown() {
			fPreferenceModel.moveDown(this);
		}
		private int getInternalRank() {
			return fPreferenceModel.readOrderPreference(fCategory);
		}
		boolean isSeparateCommand() {
			return getInternalRank() < PreferenceModel.LIMIT;
		}

		void setSeparateCommand(boolean separate) {
			if (separate != isSeparateCommand())
				fPreferenceModel.writeOrderPreference(this, separate);
		}

		void update() {
			fCategory.setIncluded(isInDefaultCategory());
			int rank= getInternalRank();
			fCategory.setSortOrder(rank);
			fCategory.setSeparateCommand(rank < PreferenceModel.LIMIT);
		}
	}

	/** element type: {@link ModelElement}. */
	private final PreferenceModel fModel;
	private final Map<ImageDescriptor, Image> fImages= new HashMap<ImageDescriptor, Image>();

	private CheckboxTableViewer fDefaultViewer;
	private CheckboxTableViewer fSeparateViewer;
	private Button fUpButton;
	private Button fDownButton;

	CodeAssistAdvancedConfigurationBlock(IStatusChangeListener statusListener, IWorkbenchPreferenceContainer container) {
		super(statusListener, null, getAllKeys(), container);
		fModel= new PreferenceModel(CompletionProposalComputerRegistry.getDefault());
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#createContents(org.eclipse.swt.widgets.Composite)
	 */
	@Override
	protected Control createContents(Composite parent) {

		ScrolledPageContent scrolled= new ScrolledPageContent(parent, SWT.H_SCROLL | SWT.V_SCROLL);

		scrolled.setExpandHorizontal(true);
		scrolled.setExpandVertical(true);

		Composite composite= new Composite(scrolled, SWT.NONE);
		int columns= 2;
		GridLayout layout= new GridLayout(columns, false);
		layout.marginWidth= 0;
		layout.marginHeight= 0;
		composite.setLayout(layout);


		createDefaultLabel(composite, columns);
		createDefaultViewer(composite, columns);
		createKeysLink(composite, columns);

		createFiller(composite, columns);

		createSeparateLabel(composite, columns);
        createSeparateSection(composite);

        createFiller(composite, columns);

		createParameterTimeoutControl(composite, columns);

		updateControls();
		if (fModel.elements.size() > 0) {
			fDefaultViewer.getTable().select(0);
			fSeparateViewer.getTable().select(0);
			handleTableSelection();
		}

		scrolled.setContent(composite);
		scrolled.setMinSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
		return scrolled;
	}

	private void createDefaultLabel(Composite composite, int h_span) {
	    final ICommandService commandSvc= (ICommandService) PlatformUI.getWorkbench().getAdapter(ICommandService.class);
		final Command command= commandSvc.getCommand(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
		ParameterizedCommand pCmd= new ParameterizedCommand(command, null);
		String key= getKeyboardShortcut(pCmd);
		if (key == null)
			key= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_no_shortcut;

		PixelConverter pixelConverter= new PixelConverter(composite);
		int width= pixelConverter.convertWidthInCharsToPixels(40);

		Label label= new Label(composite, SWT.NONE | SWT.WRAP);
		label.setText(Messages.format(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_page_description, new Object[] { key }));
		GridData gd= new GridData(GridData.FILL, GridData.FILL, true, false, h_span, 1);
		gd.widthHint= width;
		label.setLayoutData(gd);

		createFiller(composite, h_span);

		label= new Label(composite, SWT.NONE | SWT.WRAP);
		label.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_default_table_description);
		gd= new GridData(GridData.FILL, GridData.FILL, true, false, h_span, 1);
		gd.widthHint= width;
		label.setLayoutData(gd);
    }

	private void createDefaultViewer(Composite composite, int h_span) {
		fDefaultViewer= CheckboxTableViewer.newCheckList(composite, SWT.SINGLE | SWT.BORDER);
		Table table= fDefaultViewer.getTable();
		table.setHeaderVisible(true);
		table.setLinesVisible(false);
		table.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, false, false, h_span, 1));

		TableColumn nameColumn= new TableColumn(table, SWT.NONE);
		nameColumn.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_default_table_category_column_title);
		nameColumn.setResizable(false);
		TableColumn keyColumn= new TableColumn(table, SWT.NONE);
		keyColumn.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_default_table_keybinding_column_title);
		keyColumn.setResizable(false);

		fDefaultViewer.addCheckStateListener(new ICheckStateListener() {
			public void checkStateChanged(CheckStateChangedEvent event) {
				boolean checked= event.getChecked();
				ModelElement element= (ModelElement) event.getElement();
				element.setInDefaultCategory(checked);
			}
		});

		fDefaultViewer.setContentProvider(new ArrayContentProvider());

		DefaultTableLabelProvider labelProvider= new DefaultTableLabelProvider();
		fDefaultViewer.setLabelProvider(labelProvider);
		fDefaultViewer.setInput(fModel.elements);
		fDefaultViewer.setComparator(new ViewerComparator()); // sort alphabetically

		final int ICON_AND_CHECKBOX_WITH= 50;
		final int HEADER_MARGIN= 20;
		int minNameWidth= computeWidth(table, nameColumn.getText()) + HEADER_MARGIN;
		int minKeyWidth= computeWidth(table, keyColumn.getText()) + HEADER_MARGIN;
		for (int i= 0; i < fModel.elements.size(); i++) {
			minNameWidth= Math.max(minNameWidth, computeWidth(table, labelProvider.getColumnText(fModel.elements.get(i), 0)) + ICON_AND_CHECKBOX_WITH);
			minKeyWidth= Math.max(minKeyWidth, computeWidth(table, labelProvider.getColumnText(fModel.elements.get(i), 1)));
		}

		nameColumn.setWidth(minNameWidth);
		keyColumn.setWidth(minKeyWidth);
	}

	private void createKeysLink(Composite composite, int h_span) {
	    Link link= new Link(composite, SWT.NONE | SWT.WRAP);
		link.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_key_binding_hint);
		link.addSelectionListener(new SelectionAdapter() {
			@Override
			public void widgetSelected(SelectionEvent e) {
				PreferencesUtil.createPreferenceDialogOn(getShell(), e.text, null, null);
			}
		});

		PixelConverter pixelConverter= new PixelConverter(composite);
		int width= pixelConverter.convertWidthInCharsToPixels(40);

		// limit the size of the Link as it would take all it can get
		GridData gd= new GridData(GridData.FILL, GridData.FILL, false, false, h_span, 1);
		gd.widthHint= width;
		link.setLayoutData(gd);
    }

	private void createFiller(Composite composite, int h_span) {
	    Label filler= new Label(composite, SWT.NONE);
		filler.setVisible(false);
		filler.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, h_span, 1));
    }

	private void createSeparateLabel(Composite composite, int h_span) {
		PixelConverter pixelConverter= new PixelConverter(composite);
		int width= pixelConverter.convertWidthInCharsToPixels(40);

		Label label= new Label(composite, SWT.NONE | SWT.WRAP);
		label.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_separate_table_description);
		GridData gd= new GridData(GridData.FILL, GridData.FILL, false, false, h_span, 1);
		gd.widthHint= width;
		label.setLayoutData(gd);
	}

	private void createSeparateSection(Composite composite) {
		createSeparateViewer(composite);
		createButtonList(composite);
	}

	private void createSeparateViewer(Composite composite) {
		fSeparateViewer= CheckboxTableViewer.newCheckList(composite, SWT.SINGLE | SWT.BORDER);
		Table table= fSeparateViewer.getTable();
		table.setHeaderVisible(false);
		table.setLinesVisible(false);
		table.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false, 1, 1));

		TableColumn nameColumn= new TableColumn(table, SWT.NONE);
		nameColumn.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_separate_table_category_column_title);
		nameColumn.setResizable(false);

		fSeparateViewer.setContentProvider(new ArrayContentProvider());

		ITableLabelProvider labelProvider= new SeparateTableLabelProvider();
		fSeparateViewer.setLabelProvider(labelProvider);
		fSeparateViewer.setInput(fModel.elements);

		final int ICON_AND_CHECKBOX_WITH= 50;
		final int HEADER_MARGIN= 20;
		int minNameWidth= computeWidth(table, nameColumn.getText()) + HEADER_MARGIN;
		for (int i= 0; i < fModel.elements.size(); i++) {
			minNameWidth= Math.max(minNameWidth, computeWidth(table, labelProvider.getColumnText(fModel.elements.get(i), 0)) + ICON_AND_CHECKBOX_WITH);
		}

		nameColumn.setWidth(minNameWidth);

		fSeparateViewer.addCheckStateListener(new ICheckStateListener() {
			public void checkStateChanged(CheckStateChangedEvent event) {
				boolean checked= event.getChecked();
				ModelElement element= (ModelElement) event.getElement();
				element.setSeparateCommand(checked);
			}
		});

		table.addSelectionListener(new SelectionAdapter() {
			@Override
			public void widgetSelected(SelectionEvent e) {
				handleTableSelection();
			}
		});

	}

	private void createButtonList(Composite parent) {
		Composite composite= new Composite(parent, SWT.NONE);
		composite.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false));

		GridLayout layout= new GridLayout();
		layout.marginWidth= 0;
		layout.marginHeight= 0;
		composite.setLayout(layout);

		fUpButton= new Button(composite, SWT.PUSH | SWT.CENTER);
        fUpButton.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_Up);
        fUpButton.addSelectionListener(new SelectionAdapter() {
        	@Override
			public void widgetSelected(SelectionEvent e) {
        		int index= getSelectionIndex();
        		if (index != -1) {
        			fModel.elements.get(index).moveUp();
        			fSeparateViewer.refresh();
        			handleTableSelection();
        		}
        	}
        });
        fUpButton.setLayoutData(new GridData());
        SWTUtil.setButtonDimensionHint(fUpButton);

        fDownButton= new Button(composite, SWT.PUSH | SWT.CENTER);
        fDownButton.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_Down);
        fDownButton.addSelectionListener(new SelectionAdapter() {
        	@Override
			public void widgetSelected(SelectionEvent e) {
        		int index= getSelectionIndex();
        		if (index != -1) {
        			fModel.elements.get(index).moveDown();
        			fSeparateViewer.refresh();
        			handleTableSelection();
        		}
        	}
        });
        fDownButton.setLayoutData(new GridData());
        SWTUtil.setButtonDimensionHint(fDownButton);
	}

	private void createParameterTimeoutControl(Composite composite, int h_span) {
		Composite timeoutComposite= new Composite(composite, SWT.NONE);
		GridLayout layout= new GridLayout(4, false);
		layout.marginWidth= 0;
		layout.marginHeight= 0;
		timeoutComposite.setLayout(layout);
		GridData gd= new GridData(GridData.FILL, GridData.FILL, true, false, h_span, 1);
		timeoutComposite.setLayoutData(gd);

		PixelConverter pixelConverter= new PixelConverter(composite);
		String str= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout;
		addTextField(timeoutComposite, str, PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, 0, pixelConverter.convertWidthInCharsToPixels(7));

	}

	private void handleTableSelection() {
		ModelElement item= getSelectedItem();
		if (item != null) {
			int index= getSelectionIndex();
			fUpButton.setEnabled(index > 0);
			fDownButton.setEnabled(index < fModel.elements.size() - 1);
		} else {
			fUpButton.setEnabled(false);
			fDownButton.setEnabled(false);
		}
	}

	private ModelElement getSelectedItem() {
		return (ModelElement) ((IStructuredSelection) fSeparateViewer.getSelection()).getFirstElement();
	}

	private int getSelectionIndex() {
		return fSeparateViewer.getTable().getSelectionIndex();
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#updateControls()
	 */
	@Override
	protected void updateControls() {
		super.updateControls();

		fModel.update();
		updateCheckedState();
		fDefaultViewer.refresh();
		fSeparateViewer.refresh();
		handleTableSelection();
	}

	private void updateCheckedState() {
		final int size= fModel.elements.size();
		List<ModelElement> defaultChecked= new ArrayList<ModelElement>(size);
		List<ModelElement> separateChecked= new ArrayList<ModelElement>(size);

		for (Iterator<ModelElement> it= fModel.elements.iterator(); it.hasNext();) {
			ModelElement element= it.next();
			if (element.isInDefaultCategory())
				defaultChecked.add(element);
			if (element.isSeparateCommand())
				separateChecked.add(element);
		}

		fDefaultViewer.setCheckedElements(defaultChecked.toArray(new Object[defaultChecked.size()]));
		fSeparateViewer.setCheckedElements(separateChecked.toArray(new Object[separateChecked.size()]));
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#processChanges(org.eclipse.ui.preferences.IWorkbenchPreferenceContainer)
	 */
	@Override
	protected boolean processChanges(IWorkbenchPreferenceContainer container) {
		for (Iterator<ModelElement> it= fModel.elements.iterator(); it.hasNext();) {
			ModelElement item= it.next();
			item.update();
		}

		return super.processChanges(container);
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#validateSettings(org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock.Key, java.lang.String, java.lang.String)
	 */
	@Override
	protected void validateSettings(Key changedKey, String oldValue, String newValue) {
		if (changedKey == PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC) {
			final StatusInfo status= new StatusInfo();
			if (newValue.length() == 0)
				status.setError(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_emptyInput);
			else {
				try {
					int number= Integer.parseInt(newValue);
					int min= 0;
					int max= 5000;
					if (number < min || number > max) {
						String msgFormat= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidRange;
						String msg= Messages.format(msgFormat, new Object[] {new Integer(min), new Integer(max)});
						status.setError(msg);
					}
				} catch (NumberFormatException ex) {
					String msgFormat= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidInput;
					String msg= Messages.format(msgFormat, newValue);
					status.setError(msg);
				}
			}
			fContext.statusChanged(status);
		}
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#getFullBuildDialogStrings(boolean)
	 */
	@Override
	protected String[] getFullBuildDialogStrings(boolean workspaceSettings) {
		// no builds triggered by our settings
		return null;
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#dispose()
	 */
	@Override
	public void dispose() {
		for (Iterator<Image> it= fImages.values().iterator(); it.hasNext();) {
			Image image= it.next();
			image.dispose();
		}

		super.dispose();
	}

	private int computeWidth(Control control, String name) {
		if (name == null)
			return 0;
		GC gc= new GC(control);
		try {
			gc.setFont(JFaceResources.getDialogFont());
			return gc.stringExtent(name).x + 10;
		} finally {
			gc.dispose();
		}
	}

	private static BindingManager fgLocalBindingManager;
	static {
		fgLocalBindingManager= new BindingManager(new ContextManager(), new CommandManager());
		final IBindingService bindingService= (IBindingService)PlatformUI.getWorkbench().getService(IBindingService.class);
		final Scheme[] definedSchemes= bindingService.getDefinedSchemes();
		if (definedSchemes != null) {
			try {
				for (int i = 0; i < definedSchemes.length; i++) {
					final Scheme scheme= definedSchemes[i];
					final Scheme copy= fgLocalBindingManager.getScheme(scheme.getId());
					copy.define(scheme.getName(), scheme.getDescription(), scheme.getParentId());
				}
			} catch (final NotDefinedException e) {
				JavaPlugin.log(e);
			}
		}
		fgLocalBindingManager.setLocale(bindingService.getLocale());
		fgLocalBindingManager.setPlatform(bindingService.getPlatform());
	}

	private static String getKeyboardShortcut(ParameterizedCommand command) {
		IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
		fgLocalBindingManager.setBindings(bindingService.getBindings());
		try {
			Scheme activeScheme= bindingService.getActiveScheme();
			if (activeScheme != null)
				fgLocalBindingManager.setActiveScheme(activeScheme);
		} catch (NotDefinedException e) {
			JavaPlugin.log(e);
		}

		TriggerSequence[] bindings= fgLocalBindingManager.getActiveBindingsDisregardingContextFor(command);
		if (bindings.length > 0)
			return bindings[0].format();
		return null;
	}

	private Image getImage(ImageDescriptor imgDesc) {
		if (imgDesc == null)
			return null;

		Image img= fImages.get(imgDesc);
		if (img == null) {
			img= imgDesc.createImage(false);
			fImages.put(imgDesc, img);
		}
		return img;
	}

}

Lines 7-12 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java (+2 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui.preferences;	12	package org.eclipse.jdt.internal.ui.preferences;
12		13
Lines 19-24 Link Here
19	import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;	20	import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
20		21
21	import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;	22	import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
		23	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedConfigurationBlock;
22		24
23	public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferencePage {	25	public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferencePage {
24		26




 *     Sebastian Davids, sdavids@gmx.de - 187316 [preferences] Mark Occurences Pref Page; Link to
 *     Benjamin Muskalla <b.muskalla@gmx.net> - [preferences] Add preference for new compiler warning: MissingSynchronizedModifierInInheritedMethod - https://bugs.eclipse.org/bugs/show_bug.cgi?id=245240
 *     Guven Demir <guven.internet+eclipse@gmail.com> - [package explorer] Alternative package name shortening: abbreviation - https://bugs.eclipse.org/bugs/show_bug.cgi?id=299514
 *     Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.preferences;


	public static String ClasspathVariablesPreferencePage_savechanges_message;
	public static String CleanUpPreferencePage_Description;
	public static String CleanUpPreferencePage_Title;
	public static String CodeAssistAdvancedConfigurationBlock_provided_table_category_column_title;
	public static String CodeAssistAdvancedConfigurationBlock_provided_table_description;
	public static String CodeAssistAdvancedConfigurationBlock_provided_table_keybinding_column_title;
	public static String CodeAssistAdvancedConfigurationBlock_key_binding_hint;
	public static String CodeAssistAdvancedConfigurationBlock_proposal_list_table_title;
	public static String CodeAssistAdvancedConfigurationBlock_page_description;
	public static String CodeAssistAdvancedConfigurationBlock_separate_table_category_column_title;
	public static String CodeAssistAdvancedConfigurationBlock_separate_table_description;
	public static String CodeAssistAdvancedConfigurationBlock_no_shortcut;
	public static String CodeAssistAdvancedConfigurationBlock_Up;
	public static String CodeAssistAdvancedConfigurationBlock_Down;
	public static String CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout;
	public static String CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_emptyInput;
	public static String CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidInput;




#     Sebastian Davids, sdavids@gmx.de - 187316 [preferences] Mark Occurrences Pref Page; Link to
#     Benjamin Muskalla <b.muskalla@gmx.net> - [preferences] Add preference for new compiler warning: MissingSynchronizedModifierInInheritedMethod - https://bugs.eclipse.org/bugs/show_bug.cgi?id=245240
#     Guven Demir <guven.internet+eclipse@gmail.com> - [package explorer] Alternative package name shortening: abbreviation - https://bugs.eclipse.org/bugs/show_bug.cgi?id=299514
#     Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
###############################################################################

BuildPathsPropertyPage_error_message=An error occurred while setting the build path.

CodeAssistAdvancedConfigurationBlock_page_description=Configure the behavior of the content assist ({0}) command.
# stand-in text if there is no keyboard shortcut in above statement
CodeAssistAdvancedConfigurationBlock_no_shortcut=no shortcut
CodeAssistAdvancedConfigurationBlock_provided_table_description=Drag proposal kinds to lists on the right to configure which proposals you want to have on each position while repeatedly invoking content assist.
CodeAssistAdvancedConfigurationBlock_provided_table_category_column_title=Proposal Kinds
CodeAssistAdvancedConfigurationBlock_provided_table_keybinding_column_title=Key Binding
# do not translate the href argument (org.eclipse.ui.preferencePages.Keys)
CodeAssistAdvancedConfigurationBlock_key_binding_hint=Individual key bindings can be assigned to each proposal kind on the <a href="org.eclipse.ui.preferencePages.Keys">'Keys'</a> preference page.
CodeAssistAdvancedConfigurationBlock_proposal_list_table_title={0}. Proposal List
CodeAssistAdvancedConfigurationBlock_separate_table_category_column_title=Separate Proposal Kinds
CodeAssistAdvancedConfigurationBlock_Up=&Up
CodeAssistAdvancedConfigurationBlock_Down=D&own
CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout=&Timeout for fetching a parameter name from attached Javadoc (ms):

CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_emptyInput=Empty input.




/*******************************************************************************
 * Copyright (c) 2005, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;

import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.CommandManager;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.commands.contexts.ContextManager;

import org.eclipse.core.runtime.Assert;

import org.eclipse.jface.bindings.BindingManager;
import org.eclipse.jface.bindings.Scheme;
import org.eclipse.jface.bindings.TriggerSequence;
import org.eclipse.jface.layout.PixelConverter;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TableViewer;

import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.keys.IBindingService;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;

import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;

import org.eclipse.jdt.core.JavaCore;

import org.eclipse.jdt.internal.corext.util.Messages;

import org.eclipse.jdt.ui.PreferenceConstants;

import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock;
import org.eclipse.jdt.internal.ui.preferences.PreferencesMessages;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.DragProvidedCategoryListener;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.DropIntoProvidedListener;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListCategoryTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProvidedCategoryTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.ModelElement;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.PreferenceModel;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets.ProposalListSection;
import org.eclipse.jdt.internal.ui.text.java.CompletionProposalComputerRegistry;
import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;


/**
 * 
 * @since 3.2
 */
public final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlock {

	protected static final Key PREF_PROPOSAL_LISTS= getJDTUIKey(PreferenceConstants.CODEASSIST_PROPOSAL_LISTS);

	private static final Key PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC= getJDTCoreKey(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC);

	private static Key[] getAllKeys() {
		return new Key[] {
				PREF_PROPOSAL_LISTS,
				PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC
		};
	}

	private static final int NUMBER_OF_PAGE_COLUMNS= 2;

	private final class ProvidedTableLabelProvider extends LabelProvider implements ITableLabelProvider {

		/*
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
		 */
		public Image getColumnImage(Object element, int columnIndex) {
			if (columnIndex == 0)
				return ((ModelElement) element).getImage();
			return null;
		}

		/*
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
		 */
		public String getColumnText(Object element, int columnIndex) {
			switch (columnIndex) {
				case 0:
					return ((ModelElement) element).getName();
				case 1:
					return ((ModelElement) element).getKeybindingAsString();
				default:
					Assert.isTrue(false);
					return null;
			}
		}
	}

	private final PreferenceModel fModel;

	private final Map<ImageDescriptor, Image> fImages= new HashMap<ImageDescriptor, Image>();

	private TableViewer fProvidedViewer;

	private ProposalListSection fProposalListSection;

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	public CodeAssistAdvancedConfigurationBlock(IStatusChangeListener statusListener, IWorkbenchPreferenceContainer container) {
		super(statusListener, null, getAllKeys(), container);
		fUtilitiesProxy= new CodeAssistAdvancedUtilitiesProxy(this);
		fModel= new PreferenceModel(CompletionProposalComputerRegistry.getDefault(), fUtilitiesProxy);
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#createContents(org.eclipse.swt.widgets.Composite)
	 */
	@Override
	public Control createContents(Composite parent) {
		Composite composite= createWrappingComposite(parent);

		createPageDescription(composite);

		createProvidedSection(composite);
		fProposalListSection= new ProposalListSection(composite, fModel, fUtilitiesProxy);

		createFiller(composite);

		createParameterTimeoutControl(composite);

		updateControls();
		selectFirstProvidedCategory();

		return composite;
	}

	private Composite createWrappingComposite(Composite parent) {
		Composite composite= new Composite(parent, SWT.NONE);
		GridLayout layout= new GridLayout(NUMBER_OF_PAGE_COLUMNS, false);
		layout.marginWidth= 0;
		layout.marginHeight= 0;
		composite.setLayout(layout);
		return composite;
	}

	private void createPageDescription(Composite composite) {
		final ICommandService commandSvc= (ICommandService) PlatformUI.getWorkbench().getAdapter(ICommandService.class);
		final Command command= commandSvc.getCommand(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
		ParameterizedCommand pCmd= new ParameterizedCommand(command, null);
		String key= getKeyboardShortcut(pCmd);
		if (key == null)
			key= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_no_shortcut;

		PixelConverter pixelConverter= new PixelConverter(composite);
		int width= pixelConverter.convertWidthInCharsToPixels(40);

		Label label= new Label(composite, SWT.NONE | SWT.WRAP);
		label.setText(Messages.format(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_page_description, new Object[] { key }));
		GridData gd= new GridData(GridData.FILL, GridData.FILL, true, false, NUMBER_OF_PAGE_COLUMNS, 1);
		gd.widthHint= width;
		label.setLayoutData(gd);
	}

	private void createProvidedSection(Composite composite) {
		Composite providedContainer= new Composite(composite, SWT.NONE);
		GridLayout layout= new GridLayout();
		layout.marginWidth= 0;
		layout.marginHeight= 0;
		providedContainer.setLayout(layout);
		providedContainer.setLayoutData(new GridData(GridData.FILL_BOTH));

		createProvidedViewer(providedContainer);
		createProvidedLabel(providedContainer);
		createKeysLink(providedContainer);
	}

	private void createProvidedViewer(Composite composite) {
		fProvidedViewer= new TableViewer(composite, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL);
		Table table= fProvidedViewer.getTable();
		table.setHeaderVisible(true);
		table.setLinesVisible(false);
		GridData gridData= new GridData(SWT.FILL, SWT.FILL, true, true);
		gridData.heightHint= 0;
		table.setLayoutData(gridData);

		TableColumn nameColumn= new TableColumn(table, SWT.NONE);
		nameColumn.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_provided_table_category_column_title);
		nameColumn.setResizable(false);
		TableColumn keyColumn= new TableColumn(table, SWT.NONE);
		keyColumn.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_provided_table_keybinding_column_title);
		keyColumn.setResizable(false);

		fProvidedViewer.setContentProvider(new ArrayContentProvider());
		ProvidedTableLabelProvider labelProvider= new ProvidedTableLabelProvider();
		fProvidedViewer.setLabelProvider(labelProvider);
		fProvidedViewer.setInput(fModel.elements);
		fProvidedViewer.setComparator(new ModelElement.ModelElementViewerComparator()); // sort alphabetically

		final int ICON_WIDTH= 16;
		final int HEADER_MARGIN= 20;
		int minNameWidth= computeWidth(table, nameColumn.getText()) + HEADER_MARGIN;
		int minKeyWidth= computeWidth(table, keyColumn.getText()) + HEADER_MARGIN;
		for (int i= 0; i < fModel.elements.size(); i++) {
			minNameWidth= Math.max(minNameWidth, computeWidth(table, labelProvider.getColumnText(fModel.elements.get(i), 0)) + ICON_WIDTH);
			minKeyWidth= Math.max(minKeyWidth, computeWidth(table, labelProvider.getColumnText(fModel.elements.get(i), 1)));
		}
		nameColumn.setWidth(minNameWidth);
		keyColumn.setWidth(minKeyWidth);

		// add drag support for provided categories
		Transfer[] transferTypes= new Transfer[] { ProvidedCategoryTransfer.getInstance() };
		fProvidedViewer.addDragSupport(ProposalTransfer.ALL_DRAG_OPERATIONS, transferTypes, new DragProvidedCategoryListener(fProvidedViewer));

		// add drop support for proposal lists and proposal list categories
		transferTypes= new Transfer[] { ProposalListTransfer.getInstance(), ProposalListCategoryTransfer.getInstance() };
		fProvidedViewer.addDropSupport(ProposalTransfer.ALL_DRAG_OPERATIONS, transferTypes, new DropIntoProvidedListener(fProvidedViewer, fModel, fUtilitiesProxy));
	}

	private void createProvidedLabel(Composite composite) {
		PixelConverter pixelConverter= new PixelConverter(composite);
		int width= pixelConverter.convertWidthInCharsToPixels(40);

		Label label= new Label(composite, SWT.NONE | SWT.WRAP);
		label.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_provided_table_description);
		GridData gd= new GridData(GridData.FILL, GridData.FILL, true, false);
		gd.widthHint= width;
		label.setLayoutData(gd);
	}

	private void createKeysLink(Composite composite) {
		Link link= new Link(composite, SWT.NONE | SWT.WRAP);
		link.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_key_binding_hint);
		link.addSelectionListener(new SelectionAdapter() {
			@Override
			public void widgetSelected(SelectionEvent e) {
				PreferencesUtil.createPreferenceDialogOn(getShell(), e.text, null, null);
			}
		});

		PixelConverter pixelConverter= new PixelConverter(composite);
		int width= pixelConverter.convertWidthInCharsToPixels(40);

		// limit the size of the Link as it would take all it can get
		GridData gd= new GridData(GridData.FILL, GridData.FILL, false, false);
		gd.widthHint= width;
		link.setLayoutData(gd);
	}

	private void createFiller(Composite composite) {
		Label filler= new Label(composite, SWT.NONE);
		filler.setVisible(false);
		filler.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, NUMBER_OF_PAGE_COLUMNS, 1));
	}

	private void createParameterTimeoutControl(Composite composite) {
		Composite timeoutComposite= new Composite(composite, SWT.NONE);
		GridLayout layout= new GridLayout(4, false);
		layout.marginWidth= 0;
		layout.marginHeight= 0;
		timeoutComposite.setLayout(layout);
		GridData gd= new GridData(GridData.FILL, GridData.FILL, true, false, NUMBER_OF_PAGE_COLUMNS, 1);
		timeoutComposite.setLayoutData(gd);

		PixelConverter pixelConverter= new PixelConverter(composite);
		String str= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout;
		addTextField(timeoutComposite, str, PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, 0, pixelConverter.convertWidthInCharsToPixels(7));
	}

	private void selectFirstProvidedCategory() {
		if (fModel.elements.size() > 0) {
			fProvidedViewer.getTable().select(0);
		}
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#settingsUpdated()
	 */
	@Override
	protected void settingsUpdated() {
		if (fModel != null)
			fModel.updatePreferenceModel();
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#updateControls()
	 */
	@Override
	protected void updateControls() {
		super.updateControls();
		fProvidedViewer.refresh();
		fProposalListSection.updateControls();
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#processChanges(org.eclipse.ui.preferences.IWorkbenchPreferenceContainer)
	 */
	@Override
	protected boolean processChanges(IWorkbenchPreferenceContainer container) {
		fModel.updatePreferenceModel();
		return super.processChanges(container);
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#setValue(Key, String)
	 */
	@Override
	protected String setValue(Key key, String value) {
		return super.setValue(key, value);
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#getValue(Key)
	 */
	@Override
	protected String getValue(Key key) {
		return super.getValue(key);
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#validateSettings(org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock.Key, java.lang.String, java.lang.String)
	 */
	@Override
	protected void validateSettings(Key changedKey, String oldValue, String newValue) {
		if (changedKey == PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC) {
			final StatusInfo status= new StatusInfo();
			if (newValue.length() == 0)
				status.setError(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_emptyInput);
			else {
				try {
					int number= Integer.parseInt(newValue);
					int min= 0;
					int max= 5000;
					if (number < min || number > max) {
						String msgFormat= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidRange;
						String msg= Messages.format(msgFormat, new Object[] { new Integer(min), new Integer(max) });
						status.setError(msg);
					}
				} catch (NumberFormatException ex) {
					String msgFormat= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidInput;
					String msg= Messages.format(msgFormat, newValue);
					status.setError(msg);
				}
			}
			fContext.statusChanged(status);
		}
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#getFullBuildDialogStrings(boolean)
	 */
	@Override
	protected String[] getFullBuildDialogStrings(boolean workspaceSettings) {
		// no builds triggered by our settings
		return null;
	}

	/*
	 * @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#dispose()
	 */
	@Override
	public void dispose() {
		for (Iterator<Image> it= fImages.values().iterator(); it.hasNext();) {
			Image image= it.next();
			image.dispose();
		}
		super.dispose();
	}

	protected int computeWidth(Control control, String name) {
		if (name == null)
			return 0;
		GC gc= new GC(control);
		try {
			gc.setFont(JFaceResources.getDialogFont());
			return gc.stringExtent(name).x + 10;
		} finally {
			gc.dispose();
		}
	}

	protected Image getImage(ImageDescriptor imgDesc) {
		if (imgDesc == null)
			return null;

		Image img= fImages.get(imgDesc);
		if (img == null) {
			img= imgDesc.createImage(false);
			fImages.put(imgDesc, img);
		}
		return img;
	}

	private static BindingManager fgLocalBindingManager;
	static {
		fgLocalBindingManager= new BindingManager(new ContextManager(), new CommandManager());
		final IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
		final Scheme[] definedSchemes= bindingService.getDefinedSchemes();
		if (definedSchemes != null) {
			try {
				for (int i= 0; i < definedSchemes.length; i++) {
					final Scheme scheme= definedSchemes[i];
					final Scheme copy= fgLocalBindingManager.getScheme(scheme.getId());
					copy.define(scheme.getName(), scheme.getDescription(), scheme.getParentId());
				}
			} catch (final NotDefinedException e) {
				JavaPlugin.log(e);
			}
		}
		fgLocalBindingManager.setLocale(bindingService.getLocale());
		fgLocalBindingManager.setPlatform(bindingService.getPlatform());
	}

	protected static String getKeyboardShortcut(ParameterizedCommand command) {
		IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
		fgLocalBindingManager.setBindings(bindingService.getBindings());
		try {
			Scheme activeScheme= bindingService.getActiveScheme();
			if (activeScheme != null)
				fgLocalBindingManager.setActiveScheme(activeScheme);
		} catch (NotDefinedException e) {
			JavaPlugin.log(e);
		}

		TriggerSequence[] bindings= fgLocalBindingManager.getActiveBindingsDisregardingContextFor(command);
		if (bindings.length > 0)
			return bindings[0].format();
		return null;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced;

import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.TransferData;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;

import org.eclipse.core.commands.ParameterizedCommand;

import org.eclipse.jface.resource.ImageDescriptor;

import org.eclipse.ui.plugin.AbstractUIPlugin;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListCategoryTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProvidedCategoryTransfer;

/**
 * 
 * @since 3.8
 */
public class CodeAssistAdvancedUtilitiesProxy {
	public static final Color SELECTED_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION);

	public static final Color SELECTED_TEXT_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT);

	public static final Color UNSELECTED_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);

	public static final Color UNSELECTED_TEXT_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);

	public static final Color UNSELECTED_BORDER_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_GRAY);

	private static final ImageDescriptor REMOVE_PROPOSAL_LIST_ICON_DESCRIPTOR= AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.jdt.ui", "$nl$/icons/full/elcl16/remove_proposal_list.gif"); //$NON-NLS-1$ //$NON-NLS-2$

	private static final ImageDescriptor REMOVE_PROPOSAL_LIST_OVER_ICON_DESCRIPTOR= AbstractUIPlugin.imageDescriptorFromPlugin(
			"org.eclipse.jdt.ui", "$nl$/icons/full/elcl16/remove_proposal_list_over.gif"); //$NON-NLS-1$ //$NON-NLS-2$

	private CodeAssistAdvancedConfigurationBlock fConfigurationBlock;

	public final Image fRemoveProposalListImage;

	public final Image fRemoveProposalListOverImage;

	public CodeAssistAdvancedUtilitiesProxy(CodeAssistAdvancedConfigurationBlock configurationBlock) {
		this.fConfigurationBlock= configurationBlock;
		fRemoveProposalListImage= getImage(REMOVE_PROPOSAL_LIST_ICON_DESCRIPTOR);
		fRemoveProposalListOverImage= getImage(REMOVE_PROPOSAL_LIST_OVER_ICON_DESCRIPTOR);
	}

	public void updateControls() {
		fConfigurationBlock.updateControls();
	}

	public int computeWidth(Control control, String name) {
		return fConfigurationBlock.computeWidth(control, name);
	}

	public Image getImage(ImageDescriptor imgDesc) {
		return fConfigurationBlock.getImage(imgDesc);
	}

	public String getKeyboardShortcut(ParameterizedCommand command) {
		return CodeAssistAdvancedConfigurationBlock.getKeyboardShortcut(command);
	}

	public String setValue(String value) {
		return fConfigurationBlock.setValue(CodeAssistAdvancedConfigurationBlock.PREF_PROPOSAL_LISTS, value);
	}

	public String getValue() {
		return fConfigurationBlock.getValue(CodeAssistAdvancedConfigurationBlock.PREF_PROPOSAL_LISTS);
	}

	public void validateSettings(String oldValue, String newValue) {
		fConfigurationBlock.validateSettings(CodeAssistAdvancedConfigurationBlock.PREF_PROPOSAL_LISTS, oldValue, newValue);
	}

	public static int getCompatibleOperation(int operation, int supportedOperations, TransferData currentDataType) {
		int result= ProvidedCategoryTransfer.getInstance().getCompatibleOperation(operation, supportedOperations, currentDataType);
		if (result != -1)
			return result;
		result= ProposalListTransfer.getInstance().getCompatibleOperation(operation, supportedOperations, currentDataType);
		if (result != -1)
			return result;
		result= ProposalListCategoryTransfer.getInstance().getCompatibleOperation(operation, supportedOperations, currentDataType);
		if (result != -1)
			return result;
		return DND.DROP_NONE;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.DropTargetListener;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets.ProposalListSection;

/**
 * 
 * @since 3.8
 */
public final class AutoscrollDropTargetListener implements DropTargetListener {
	private ProposalListSection fProposalListSection;

	public AutoscrollDropTargetListener(ProposalListSection proposalListSection) {
		this.fProposalListSection= proposalListSection;
	}

	public void dragEnter(DropTargetEvent event) {
		event.detail= DND.DROP_NONE;
	}

	public void dragLeave(DropTargetEvent event) {
	}

	public void dragOperationChanged(DropTargetEvent event) {
		event.detail= DND.DROP_NONE;
	}

	public void dragOver(DropTargetEvent event) {
		fProposalListSection.autoScroll(event);
	}

	public void drop(DropTargetEvent event) {
		event.detail= DND.DROP_NONE;
	}

	public void dropAccept(DropTargetEvent event) {
		event.detail= DND.DROP_NONE;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.dnd.DragSourceListener;

import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TableViewer;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.ModelElement;

/**
 * 
 * @since 3.8
 */
public final class DragProposalListCategoryListener implements DragSourceListener {
	private final TableViewer fViewer;

	private final Integer fListIndex;

	public DragProposalListCategoryListener(TableViewer viewer, int listIndex) {
		this.fViewer= viewer;
		this.fListIndex= Integer.valueOf(listIndex);
	}

	public void dragSetData(DragSourceEvent event) {
		if (ProposalListCategoryTransfer.getInstance().isSupportedType(event.dataType)) {
			IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection();
			if (fViewer.getSelection() != null && !fViewer.getSelection().isEmpty()) {
				ModelElement firstElement= (ModelElement) selection.getFirstElement();
				if (firstElement != null)
					event.data= new ProposalTransferType[] { new ProposalTransferType(firstElement.getId(), fListIndex) };
			}
		}
	}

	public void dragStart(DragSourceEvent event) {
		if (fViewer.getSelection() == null || fViewer.getSelection().isEmpty() || ((IStructuredSelection) fViewer.getSelection()).getFirstElement() == null) {
			event.doit= false;
		}
	}

	public void dragFinished(DragSourceEvent event) {
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.dnd.DragSourceListener;

/**
 * 
 * @since 3.8
 */
public final class DragProposalListListener implements DragSourceListener {
	private final Integer fListIndex;

	public DragProposalListListener(int listIndex) {
		this.fListIndex= Integer.valueOf(listIndex);
	}

	public void dragSetData(DragSourceEvent event) {
		if (ProposalListTransfer.getInstance().isSupportedType(event.dataType)) {
			event.data= new ProposalTransferType[] { new ProposalTransferType(fListIndex) };
		}
	}

	public void dragStart(DragSourceEvent event) {
	}

	public void dragFinished(DragSourceEvent event) {
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.dnd.DragSourceListener;

import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TableViewer;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.ModelElement;

/**
 * 
 * @since 3.8
 */
public final class DragProvidedCategoryListener implements DragSourceListener {
	private final TableViewer fViewer;

	public DragProvidedCategoryListener(TableViewer viewer) {
		this.fViewer= viewer;
	}

	public void dragSetData(DragSourceEvent event) {
		if (ProvidedCategoryTransfer.getInstance().isSupportedType(event.dataType)) {
			IStructuredSelection selection= (IStructuredSelection) fViewer.getSelection();
			if (fViewer.getSelection() != null && !fViewer.getSelection().isEmpty()) {
				ModelElement firstElement= (ModelElement) selection.getFirstElement();
				if (firstElement != null)
					event.data= new ProposalTransferType[] { new ProposalTransferType(firstElement.getId()) };
			}
		}
	}

	public void dragStart(DragSourceEvent event) {
		if (fViewer.getSelection() == null || fViewer.getSelection().isEmpty() || ((IStructuredSelection) fViewer.getSelection()).getFirstElement() == null) {
			event.doit= false;
		}
	}

	public void dragFinished(DragSourceEvent event) {
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.TransferData;

import org.eclipse.jface.viewers.ViewerDropAdapter;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedUtilitiesProxy;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.PreferenceModel;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets.ProposalList;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets.ProposalListSection;

/**
 * 
 * @since 3.8
 */
public final class DropIntoProposalListListener extends ViewerDropAdapter {
	private final PreferenceModel fModel;

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	private final int fListIndex;

	private final ProposalListSection fProposalListSection;

	private final ProposalList fProposalList;

	public DropIntoProposalListListener(ProposalList proposalList, int listIndex, PreferenceModel model, CodeAssistAdvancedUtilitiesProxy utilitiesProxy, ProposalListSection proposalListSection) {
		super(proposalList.getTableViewer());
		this.fListIndex= listIndex;
		this.fProposalList= proposalList;
		this.fModel= model;
		this.fUtilitiesProxy= utilitiesProxy;
		this.fProposalListSection= proposalListSection;
	}

	@Override
	public void dragEnter(DropTargetEvent event) {
		event.detail= CodeAssistAdvancedUtilitiesProxy.getCompatibleOperation(event.detail, event.operations, event.currentDataType);
	}

	@Override
	public void drop(DropTargetEvent event) {
		super.drop(event);
		drop: {
			if (event.data == null)
				break drop;
			ProposalTransferType data= ((ProposalTransferType[]) event.data)[0];
			if (data.getListIndex() == null && fModel.isValidCategoryId(data.getCategoryId())) {
				// category dragged from provided list
				switch (event.detail) {
					case DND.DROP_COPY:
						fModel.getElement(data.getCategoryId()).setInProposalList(fListIndex);
						break;
					default:
						break drop;
				}
				fUtilitiesProxy.updateControls();
				return;
			}
			if (data.getListIndex() == null)
				break drop;
			int sourceListIndex= data.getListIndex().intValue();
			if (sourceListIndex == fListIndex)
				break drop;
			if (data.getCategoryId() == null) {
				// proposal list has been dragged
				switch (event.detail) {
					case DND.DROP_COPY:
						// COPY all elements from source list to this list
						fModel.mergeLists(sourceListIndex, fListIndex, false);
						break;
					case DND.DROP_MOVE:
						// MOVE all elements from source list to this list
						fModel.mergeLists(sourceListIndex, fListIndex, true);
						break;
					default:
						break drop;
				}
				fUtilitiesProxy.updateControls();
				return;
			}
			if (fModel.isValidCategoryId(data.getCategoryId())) {
				// category dragged from proposal list
				switch (event.detail) {
					case DND.DROP_COPY:
						fModel.getElement(data.getCategoryId()).setInProposalList(fListIndex);
						break;
					case DND.DROP_MOVE:
						fModel.getElement(data.getCategoryId()).moveToProposalList(sourceListIndex, fListIndex);
						break;
					default:
						break drop;
				}
				fUtilitiesProxy.updateControls();
				return;
			}
		}
		event.detail= DND.DROP_NONE;
	}

	@Override
	public boolean performDrop(Object data) {
		return true; // behavior completely implemented in drop-method
	}

	@Override
	public void dragOperationChanged(DropTargetEvent event) {
		event.detail= CodeAssistAdvancedUtilitiesProxy.getCompatibleOperation(event.detail, event.operations, event.currentDataType);
		if (event.detail == DND.DROP_NONE)
			fProposalList.highlight(false);
	}

	@Override
	public boolean validateDrop(Object target, int operation, TransferData transferType) {
		return ProvidedCategoryTransfer.getInstance().isSupportedType(transferType) ||
				ProposalListCategoryTransfer.getInstance().isSupportedType(transferType) ||
				ProposalListTransfer.getInstance().isSupportedType(transferType);
	}

	@Override
	public void dragOver(DropTargetEvent event) {
		event.feedback= DND.FEEDBACK_NONE;
		if (event.detail != DND.DROP_NONE)
			fProposalList.highlight(true);
		fProposalListSection.autoScroll(event);
	}

	@Override
	public void dragLeave(DropTargetEvent event) {
		fProposalList.highlight(false);
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.TransferData;

import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerDropAdapter;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedUtilitiesProxy;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.PreferenceModel;

/**
 * 
 * @since 3.8
 */
public final class DropIntoProvidedListener extends ViewerDropAdapter {
	private final PreferenceModel fModel;

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	public DropIntoProvidedListener(TableViewer viewer, PreferenceModel model, CodeAssistAdvancedUtilitiesProxy utilitiesProxy) {
		super(viewer);
		this.fModel= model;
		this.fUtilitiesProxy= utilitiesProxy;
	}

	@Override
	public boolean validateDrop(Object target, int operation, TransferData transferType) {
		return ProposalListCategoryTransfer.getInstance().isSupportedType(transferType) ||
				ProposalListTransfer.getInstance().isSupportedType(transferType);
	}

	@Override
	public boolean performDrop(Object data) {
		ProposalTransferType transferData= ((ProposalTransferType[]) data)[0];
		if (transferData.getListIndex() != null) {
			int listIndex= transferData.getListIndex().intValue();
			if (fModel.isValidCategoryId(transferData.getCategoryId()))
				// category dragged from proposal list
				fModel.getElement(transferData.getCategoryId()).removeInProposalList(listIndex);
			else if (transferData.getCategoryId() == null)
				// proposal list has been dragged
				fModel.removeList(listIndex);
			fUtilitiesProxy.updateControls();
			return true;
		}
		return false;
	}

	@Override
	public void dragEnter(DropTargetEvent event) {
		event.detail= this.getCompatibleOperation(event.detail, event.operations, event.currentDataType);
	}

	@Override
	public void dragOperationChanged(DropTargetEvent event) {
		event.detail= this.getCompatibleOperation(event.detail, event.operations, event.currentDataType);
	}

	@Override
	public void dragOver(DropTargetEvent event) {
		event.feedback= DND.FEEDBACK_NONE;
	}

	private int getCompatibleOperation(int detail, int operations, TransferData currentDataType) {
		int operation= CodeAssistAdvancedUtilitiesProxy.getCompatibleOperation(detail, operations, currentDataType);
		if (operation != DND.DROP_MOVE)
			return DND.DROP_NONE;
		return operation;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import java.util.Arrays;

import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.DropTargetListener;
import org.eclipse.swt.widgets.Composite;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedUtilitiesProxy;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.PreferenceModel;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets.ProposalListSection;

/**
 * 
 * @since 3.8
 */
public final class DropNewProposalListListener implements DropTargetListener {

	private final ProposalListSection fProposalListSection;

	private final Composite fHighlightComposite;

	private final int fListIndex;

	private final PreferenceModel fModel;

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	public DropNewProposalListListener(Composite highlightComposite, int listIndex, PreferenceModel model, CodeAssistAdvancedUtilitiesProxy utilitiesProxy, ProposalListSection proposalListSection) {
		this.fHighlightComposite= highlightComposite;
		this.fListIndex= listIndex;
		this.fModel= model;
		this.fUtilitiesProxy= utilitiesProxy;
		this.fProposalListSection= proposalListSection;
	}

	public void dragEnter(DropTargetEvent event) {
		event.detail= CodeAssistAdvancedUtilitiesProxy.getCompatibleOperation(event.detail, event.operations, event.currentDataType);
	}

	public void dragOperationChanged(DropTargetEvent event) {
		event.detail= CodeAssistAdvancedUtilitiesProxy.getCompatibleOperation(event.detail, event.operations, event.currentDataType);
		if (event.detail == DND.DROP_NONE)
			highlight(false);
	}

	public void dragOver(DropTargetEvent event) {
		if (event.detail != DND.DROP_NONE) {
			highlight(true);
		}
		fProposalListSection.autoScroll(event);
	}

	public void dragLeave(DropTargetEvent event) {
		highlight(false);
	}

	private void highlight(boolean selected) {
		if (selected)
			fHighlightComposite.setBackground(CodeAssistAdvancedUtilitiesProxy.SELECTED_COLOR);
		else
			fHighlightComposite.setBackground(CodeAssistAdvancedUtilitiesProxy.UNSELECTED_COLOR);
		fHighlightComposite.update();
	}

	public void drop(DropTargetEvent event) {
		drop: {
			if (event.data == null)
				break drop;
			ProposalTransferType data= ((ProposalTransferType[]) event.data)[0];
			if (data.getListIndex() == null && fModel.isValidCategoryId(data.getCategoryId())) {
				// category dragged from provided list
				switch (event.detail) {
					case DND.DROP_COPY:
						fModel.addNewList(fListIndex, Arrays.asList(data.getCategoryId()));
						break;
					default:
						break drop;
				}
				fUtilitiesProxy.updateControls();
				return;
			}
			if (data.getListIndex() == null)
				break drop;
			int sourceListIndex= data.getListIndex().intValue();
			if (data.getCategoryId() == null) {
				// proposal list has been dragged
				switch (event.detail) {
					case DND.DROP_COPY:
						fModel.addNewList(fListIndex, fModel.getCategoryIds(sourceListIndex));
						break;
					case DND.DROP_MOVE:
						if (sourceListIndex != fListIndex && sourceListIndex + 1 != fListIndex)
							fModel.moveList(sourceListIndex, fListIndex);
						else
							break drop;
						break;
					default:
						break drop;
				}
				fUtilitiesProxy.updateControls();
				return;
			}
			if (fModel.isValidCategoryId(data.getCategoryId())) {
				// category dragged from proposal list
				switch (event.detail) {
					case DND.DROP_MOVE:
						fModel.addNewList(fListIndex, Arrays.asList(data.getCategoryId()));
						int removeIndex= fListIndex > sourceListIndex ? sourceListIndex : sourceListIndex + 1;
						fModel.getElement(data.getCategoryId()).removeInProposalList(removeIndex);
						break;
					case DND.DROP_COPY:
						fModel.addNewList(fListIndex, Arrays.asList(data.getCategoryId()));
						break;
					default:
						break drop;
				}
				fUtilitiesProxy.updateControls();
				return;
			}
		}
		event.detail= DND.DROP_NONE;
	}

	public void dropAccept(DropTargetEvent event) {
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import org.eclipse.swt.dnd.DND;

/**
 * 
 * @since 3.8
 */
public final class ProposalListCategoryTransfer extends ProposalTransfer {
	private static final String TRANSFER_NAME= "ProposalListCategoryTransfer"; //$NON-NLS-1$

	private static final ProposalListCategoryTransfer instance= new ProposalListCategoryTransfer();

	private ProposalListCategoryTransfer() {
		super(TRANSFER_NAME);
	}

	public static ProposalListCategoryTransfer getInstance() {
		return instance;
	}

	@Override
	public int getDefaultOperation(int supportedOperations) {
		if ((supportedOperations & DND.DROP_MOVE) != 0)
			return DND.DROP_MOVE;
		else if ((supportedOperations & DND.DROP_COPY) != 0)
			return DND.DROP_COPY;
		return DND.DROP_NONE;
	}

	@Override
	public boolean isSupportedOperation(int operation) {
		return operation == DND.DROP_COPY || operation == DND.DROP_MOVE;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import org.eclipse.swt.dnd.DND;

/**
 * 
 * @since 3.8
 */
public final class ProposalListTransfer extends ProposalTransfer {
	private static final String TRANSFER_NAME= "ProposalListTransfer"; //$NON-NLS-1$

	private static final ProposalListTransfer instance= new ProposalListTransfer();

	private ProposalListTransfer() {
		super(TRANSFER_NAME);
	}

	public static ProposalListTransfer getInstance() {
		return instance;
	}

	@Override
	public int getDefaultOperation(int supportedOperations) {
		if ((supportedOperations & DND.DROP_MOVE) != 0)
			return DND.DROP_MOVE;
		else if ((supportedOperations & DND.DROP_COPY) != 0)
			return DND.DROP_COPY;
		return DND.DROP_NONE;
	}

	@Override
	public boolean isSupportedOperation(int operation) {
		return operation == DND.DROP_COPY || operation == DND.DROP_MOVE;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

import org.eclipse.swt.dnd.ByteArrayTransfer;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.TransferData;

/**
 * 
 * @since 3.8
 */
public abstract class ProposalTransfer extends ByteArrayTransfer {
	public static final int ALL_DRAG_OPERATIONS= DND.DROP_COPY | DND.DROP_DEFAULT | DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_TARGET_MOVE;

	private final String fTransferName;

	private final int fTransferId;

	protected ProposalTransfer(String transferName) {
		this.fTransferName= transferName;
		this.fTransferId= registerType(transferName);
	}

	public abstract int getDefaultOperation(int supportedOperations);

	public abstract boolean isSupportedOperation(int operation);

	@Override
	public void javaToNative(Object object, TransferData transferData) {
		if (!checkProposalTransferType(object) || !isSupportedType(transferData))
			DND.error(DND.ERROR_INVALID_DATA);
		ProposalTransferType[] props= (ProposalTransferType[]) object;
		ByteArrayOutputStream out= new ByteArrayOutputStream();
		DataOutputStream writeOut= new DataOutputStream(out);
		try {
			for (int i= 0, length= props.length; i < length; i++) {
				if (props[i].getCategoryId() != null) {
					byte[] buffer= props[i].getCategoryId().getBytes();
					writeOut.writeInt(buffer.length);
					writeOut.write(buffer);
				} else
					writeOut.writeInt(0);
				Integer index= props[i].getListIndex();
				writeOut.writeInt(index == null ? -1 : index.intValue());
			}
			byte[] buffer= out.toByteArray();
			super.javaToNative(buffer, transferData);
		} catch (IOException e) {
		} finally {
			try {
				writeOut.close();
			} catch (IOException e) {
			}
		}
	}

	@Override
	public Object nativeToJava(TransferData transferData) {
		if (isSupportedType(transferData)) {
			byte[] buffer= (byte[]) super.nativeToJava(transferData);
			if (buffer == null)
				return null;

			List<ProposalTransferType> props= new ArrayList<ProposalTransferType>();
			ByteArrayInputStream in= new ByteArrayInputStream(buffer);
			DataInputStream readIn= new DataInputStream(in);
			try {
				while (readIn.available() > 0) {
					ProposalTransferType proposal= new ProposalTransferType();
					int size= readIn.readInt();
					if (size == 0)
						proposal.setCategoryId(null);
					else {
						byte[] id= new byte[size];
						readIn.read(id);
						proposal.setCategoryId(new String(id));
					}
					int index= readIn.readInt();
					proposal.setListIndex(index < 0 ? null : Integer.valueOf(index));
					props.add(proposal);
				}
			} catch (IOException ex) {
				return null;
			} finally {
				try {
					readIn.close();
				} catch (IOException e) {
					return null;
				}
			}
			return props.toArray(new ProposalTransferType[0]);
		}
		return null;
	}

	@Override
	protected int[] getTypeIds() {
		return new int[] { fTransferId };
	}

	@Override
	protected String[] getTypeNames() {
		return new String[] { fTransferName };
	}

	@Override
	protected boolean validate(Object object) {
		return checkProposalTransferType(object);
	}

	public int getCompatibleOperation(int operation, int supportedOperations, TransferData currentDataType) {
		if (this.isSupportedType(currentDataType)) {
			if (operation == DND.DROP_DEFAULT)
				return this.getDefaultOperation(supportedOperations);
			if (this.isSupportedOperation(operation) && (supportedOperations & operation) != 0)
				return operation;
			return DND.DROP_NONE;
		}
		return -1;
	}

	private boolean checkProposalTransferType(Object object) {
		if (object == null || !(object instanceof ProposalTransferType[]) || ((ProposalTransferType[]) object).length == 0)
			return false;
		ProposalTransferType[] cats= (ProposalTransferType[]) object;
		for (ProposalTransferType category : cats)
			if (category == null || ((category.getCategoryId() == null || category.getCategoryId().length() == 0) && category.getListIndex() == null))
				return false;
		return true;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

/**
 * 
 * @since 3.8
 */
public final class ProposalTransferType {
	private Integer fListIndex;

	private String fCategoryId;

	public ProposalTransferType() {
	}

	public ProposalTransferType(String categoryId) {
		this.fCategoryId= categoryId;
	}

	public ProposalTransferType(Integer listIndex) {
		this.fListIndex= listIndex;
	}

	public ProposalTransferType(String categoryId, Integer listIndex) {
		this.fCategoryId= categoryId;
		this.fListIndex= listIndex;
	}

	public Integer getListIndex() {
		return fListIndex;
	}

	public void setListIndex(Integer listIndex) {
		fListIndex= listIndex;
	}

	public String getCategoryId() {
		return fCategoryId;
	}

	public void setCategoryId(String categoryId) {
		fCategoryId= categoryId;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd;

import org.eclipse.swt.dnd.DND;

/**
 * 
 * @since 3.8
 */
public final class ProvidedCategoryTransfer extends ProposalTransfer {
	private static final String TRANSFER_NAME= "ProvidedCategoryTransfer"; //$NON-NLS-1$

	private static final ProvidedCategoryTransfer instance= new ProvidedCategoryTransfer();

	private ProvidedCategoryTransfer() {
		super(TRANSFER_NAME);
	}

	public static ProvidedCategoryTransfer getInstance() {
		return instance;
	}

	@Override
	public int getDefaultOperation(int supportedOperations) {
		if ((supportedOperations & DND.DROP_COPY) != 0)
			return DND.DROP_COPY;
		return DND.DROP_NONE;
	}

	@Override
	public boolean isSupportedOperation(int operation) {
		return operation == DND.DROP_COPY;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model;

import java.util.Comparator;
import java.util.Set;

import org.eclipse.swt.graphics.Image;

import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.IParameter;
import org.eclipse.core.commands.Parameterization;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.commands.common.NotDefinedException;

import org.eclipse.core.runtime.Assert;

import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator;

import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedUtilitiesProxy;
import org.eclipse.jdt.internal.ui.text.java.CompletionProposalCategory;

/**
 * 
 * @since 3.8
 */
public final class ModelElement {

	public static final class ModelElementComparator implements Comparator<ModelElement> {
		public int compare(ModelElement o1, ModelElement o2) {
			return o1.getName().compareTo(o2.getName());
		}
	}

	public static final class ModelElementViewerComparator extends ViewerComparator {
		@Override
		public int compare(Viewer viewer, Object e1, Object e2) {
			ModelElement m1= (ModelElement) e1;
			ModelElement m2= (ModelElement) e2;
			return new ModelElementComparator().compare(m1, m2);
		}
	}

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	private final CompletionProposalCategory fCategory;

	private final Command fCommand;

	private final IParameter fParam;

	private final PreferenceModel fPreferenceModel;

	ModelElement(CompletionProposalCategory category, PreferenceModel model, CodeAssistAdvancedUtilitiesProxy utilitiesProxy) {
		fCategory= category;
		ICommandService commandSvc= (ICommandService) PlatformUI.getWorkbench().getAdapter(ICommandService.class);
		fCommand= commandSvc.getCommand("org.eclipse.jdt.ui.specific_content_assist.command"); //$NON-NLS-1$
		IParameter type;
		try {
			type= fCommand.getParameters()[0];
		} catch (NotDefinedException x) {
			Assert.isTrue(false);
			type= null;
		}
		fParam= type;
		fPreferenceModel= model;
		fUtilitiesProxy= utilitiesProxy;
	}

	public Image getImage() {
		return fUtilitiesProxy.getImage(fCategory.getImageDescriptor());
	}

	public String getName() {
		return fCategory.getDisplayName();
	}

	public String getKeybindingAsString() {
		final Parameterization[] params= { new Parameterization(fParam, fCategory.getId()) };
		final ParameterizedCommand pCmd= new ParameterizedCommand(fCommand, params);
		String key= fUtilitiesProxy.getKeyboardShortcut(pCmd);
		return key;
	}

	public Set<Integer> getProposalListIndices() {
		return fCategory.getProposalListIndices();
	}

	public boolean isInProposalList(int index) {
		return getProposalListIndices().contains(Integer.valueOf(index));
	}

	public void setInProposalList(int index) {
		if (!isInProposalList(index))
			fPreferenceModel.changeSingleCategory(this, Integer.valueOf(index), null);
	}

	public void moveToProposalList(int sourceIndex, int targetIndex) {
		if (!isInProposalList(targetIndex) || isInProposalList(sourceIndex))
			fPreferenceModel.changeSingleCategory(this, Integer.valueOf(targetIndex), Integer.valueOf(sourceIndex));
	}

	public void removeInProposalList(int index) {
		if (isInProposalList(index))
			fPreferenceModel.changeSingleCategory(this, null, Integer.valueOf(index));
	}

	public String getId() {
		return fCategory.getId();
	}

	void updateIndices(Set<Integer> indices) {
		fCategory.clearProposalListIndices();
		fCategory.addAllProposalListIndices(indices);
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeMap;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedUtilitiesProxy;
import org.eclipse.jdt.internal.ui.text.java.CompletionProposalCategory;
import org.eclipse.jdt.internal.ui.text.java.CompletionProposalComputerRegistry;

/**
 * 
 * @since 3.8
 */
public final class PreferenceModel {
	private static final String COLON= ":"; //$NON-NLS-1$

	private static final String SEPARATOR= "\0"; //$NON-NLS-1$

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	private final List<ModelElement> fElements;

	/**
	 * The read-only list of elements.
	 */
	public final List<ModelElement> elements;

	public PreferenceModel(CompletionProposalComputerRegistry registry, CodeAssistAdvancedUtilitiesProxy utilitiesProxy) {
		fUtilitiesProxy= utilitiesProxy;
		List<CompletionProposalCategory> categories= registry.getProposalCategories();
		fElements= new ArrayList<ModelElement>();
		for (CompletionProposalCategory category : categories)
			if (category.hasComputers())
				fElements.add(new ModelElement(category, this, fUtilitiesProxy));
		elements= Collections.unmodifiableList(fElements);
	}

	public void changeSingleCategory(ModelElement changed, Integer addIndex, Integer removeIndex) {
		int initialBufferSize= 50 * fElements.size();
		Map<Integer, StringBuffer> proposalListsCategories= new TreeMap<Integer, StringBuffer>();
		for (ModelElement item : fElements) {
			Set<Integer> indices= new HashSet<Integer>(item.getProposalListIndices());
			if (changed == item) {
				if (addIndex != null)
					indices.add(addIndex);
				if (removeIndex != null)
					indices.remove(removeIndex);
			}
			for (Integer index : indices) {
				StringBuffer buf= proposalListsCategories.get(index);
				if (buf == null) {
					buf= new StringBuffer(initialBufferSize);
					proposalListsCategories.put(index, buf);
				}
				buf.append(item.getId());
				buf.append(COLON);
			}
		}
		writeProposalListsPreferences(proposalListsCategories, initialBufferSize);
	}

	public void removeList(int listIndex) {
		int initialBufferSize= 50 * fElements.size();
		Map<Integer, StringBuffer> proposalListsCategories= new TreeMap<Integer, StringBuffer>();
		for (ModelElement item : fElements) {
			for (int index : item.getProposalListIndices()) {
				if (listIndex == index)
					continue;
				else if (index > listIndex)
					index--;
				StringBuffer buf= proposalListsCategories.get(Integer.valueOf(index));
				if (buf == null) {
					buf= new StringBuffer(initialBufferSize);
					proposalListsCategories.put(Integer.valueOf(index), buf);
				}
				buf.append(item.getId());
				buf.append(COLON);
			}
		}
		writeProposalListsPreferences(proposalListsCategories, initialBufferSize);
	}

	public void addNewList(int listIndex, List<String> categoryIds) {
		int initialBufferSize= 50 * fElements.size();
		Map<Integer, StringBuffer> proposalListsCategories= new TreeMap<Integer, StringBuffer>();
		for (ModelElement item : fElements) {
			for (int index : item.getProposalListIndices()) {
				if (index >= listIndex)
					index++;
				StringBuffer buf= proposalListsCategories.get(Integer.valueOf(index));
				if (buf == null) {
					buf= new StringBuffer(initialBufferSize);
					proposalListsCategories.put(Integer.valueOf(index), buf);
				}
				buf.append(item.getId());
				buf.append(COLON);
			}
		}
		if (categoryIds != null && !categoryIds.isEmpty()) {
			// add categories to new list 
			StringBuffer newListBuf= new StringBuffer(initialBufferSize);
			proposalListsCategories.put(Integer.valueOf(listIndex), newListBuf);
			for (String catId : categoryIds) {
				newListBuf.append(catId);
				newListBuf.append(COLON);
			}
		}
		writeProposalListsPreferences(proposalListsCategories, initialBufferSize);
	}

	public void moveList(int listIndex, int targetIndex) {
		int initialBufferSize= 50 * fElements.size();
		Map<Integer, StringBuffer> proposalListsCategories= new TreeMap<Integer, StringBuffer>();
		for (ModelElement item : fElements) {
			for (int index : item.getProposalListIndices()) {
				if (index > listIndex && index < targetIndex)
					index--;
				else if (index >= targetIndex && index < listIndex)
					index++;
				else if (index == listIndex)
					index= listIndex < targetIndex ? targetIndex - 1 : targetIndex;
				StringBuffer buf= proposalListsCategories.get(Integer.valueOf(index));
				if (buf == null) {
					buf= new StringBuffer(initialBufferSize);
					proposalListsCategories.put(Integer.valueOf(index), buf);
				}
				buf.append(item.getId());
				buf.append(COLON);
			}
		}
		writeProposalListsPreferences(proposalListsCategories, initialBufferSize);
	}

	public void mergeLists(int sourceIndex, int targetIndex, boolean removeSource) {
		int initialBufferSize= 50 * fElements.size();
		Map<Integer, StringBuffer> proposalListsCategories= new TreeMap<Integer, StringBuffer>();
		for (ModelElement item : fElements) {
			Set<Integer> indices= new HashSet<Integer>(item.getProposalListIndices());
			if (indices.contains(Integer.valueOf(sourceIndex))) {
				if (removeSource)
					indices.remove(Integer.valueOf(sourceIndex));
				indices.add(Integer.valueOf(targetIndex));
			}
			for (Integer index : indices) {
				StringBuffer buf= proposalListsCategories.get(index);
				if (buf == null) {
					buf= new StringBuffer(initialBufferSize);
					proposalListsCategories.put(index, buf);
				}
				buf.append(item.getId());
				buf.append(COLON);
			}
		}
		writeProposalListsPreferences(proposalListsCategories, initialBufferSize);
	}

	private void writeProposalListsPreferences(Map<Integer, StringBuffer> proposalListsCategories, int initialBufferSize) {
		StringBuffer buf= new StringBuffer(initialBufferSize * proposalListsCategories.size());
		for (StringBuffer proposalList : proposalListsCategories.values()) {
			buf.append(proposalList);
			buf.append(SEPARATOR);
		}
		String newValue= buf.toString();
		String oldValue= fUtilitiesProxy.setValue(newValue);
		fUtilitiesProxy.validateSettings(oldValue, newValue);
		updatePreferenceModel();
	}

	public void updatePreferenceModel() {
		Map<String, Set<Integer>> newConfig= new HashMap<String, Set<Integer>>();
		StringTokenizer tok= new StringTokenizer(fUtilitiesProxy.getValue(), SEPARATOR);
		for (int listIndex= 0; tok.hasMoreTokens(); listIndex++) {
			StringTokenizer inner= new StringTokenizer(tok.nextToken(), COLON);
			if (inner.countTokens() == 0)
				listIndex--;
			while (inner.hasMoreTokens()) {
				String categoryId= inner.nextToken();
				Set<Integer> indices= newConfig.get(categoryId);
				if (indices == null) {
					indices= new HashSet<Integer>();
					newConfig.put(categoryId, indices);
				}
				indices.add(Integer.valueOf(listIndex));
			}
		}
		for (ModelElement elem : fElements)
			elem.updateIndices(newConfig.get(elem.getId()));
	}

	public ModelElement getElement(String id) {
		for (ModelElement el : fElements)
			if (el.getId().equals(id))
				return el;
		return null;
	}

	public List<ModelElement> getElements(int index) {
		List<ModelElement> result= new ArrayList<ModelElement>();
		for (ModelElement el : fElements)
			if (el.getProposalListIndices() != null && el.getProposalListIndices().contains(Integer.valueOf(index)))
				result.add(el);
		return result;
	}

	public List<String> getCategoryIds(int index) {
		List<String> result= new ArrayList<String>();
		for (ModelElement el : fElements)
			if (el.getProposalListIndices() != null && el.getProposalListIndices().contains(Integer.valueOf(index)))
				result.add(el.getId());
		return result;
	}

	public boolean isValidCategoryId(String id) {
		if (id != null)
			return getElement(id) != null;
		return false;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets;

import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DropTarget;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedUtilitiesProxy;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.DropNewProposalListListener;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListCategoryTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProvidedCategoryTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.PreferenceModel;

/**
 * 
 * @since 3.8
 */
public final class NewListDropSection {
	private final PreferenceModel fModel;

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	private final ProposalListSection fProposalListSection;

	private final Composite fPaddingComposite;

	private final Composite fHighlightComposite;

	public NewListDropSection(Composite wrappingComposite, int listIndex, PreferenceModel model, ProposalListSection proposalListSection, CodeAssistAdvancedUtilitiesProxy utilitiesProxy) {
		this.fModel= model;
		this.fUtilitiesProxy= utilitiesProxy;
		this.fProposalListSection= proposalListSection;

		fPaddingComposite= createPaddingComposite(wrappingComposite);
		fHighlightComposite= createHighlightComposite(fPaddingComposite);

		addDropSupport(fPaddingComposite, fHighlightComposite, listIndex);
	}

	public void activateLastPositionSpaceBehavior(boolean last) {
		GridData gd= new GridData(GridData.FILL, GridData.FILL, true, last);
		gd.heightHint= 10;
		fPaddingComposite.setLayoutData(gd);
	}

	public void dispose() {
		fPaddingComposite.dispose();
		fHighlightComposite.dispose();
	}

	private Composite createPaddingComposite(Composite wrappingComposite) {
		Composite paddingComposite= new Composite(wrappingComposite, SWT.NONE);
		GridData gd= new GridData(GridData.FILL, GridData.BEGINNING, true, false);
		gd.heightHint= 10;
		paddingComposite.setLayoutData(gd);
		GridLayout layout= new GridLayout();
		layout.marginHeight= 0;
		layout.verticalSpacing= 0;
		layout.marginWidth= 0;
		paddingComposite.setLayout(layout);
		return paddingComposite;
	}

	private Composite createHighlightComposite(Composite paddingComposite) {
		Composite highlightComposite= new Composite(paddingComposite, SWT.NONE);
		GridData gd= new GridData(SWT.FILL, SWT.BEGINNING, true, true);
		gd.heightHint= 2;
		gd.verticalIndent= 4;
		highlightComposite.setLayoutData(gd);
		return highlightComposite;
	}

	private void addDropSupport(Composite paddingComposite, Composite highlightComposite, int listIndex) {
		Transfer[] transferTypes= new Transfer[] { ProvidedCategoryTransfer.getInstance(), ProposalListCategoryTransfer.getInstance(), ProposalListTransfer.getInstance() };
		DropTarget dropTarget= new DropTarget(paddingComposite, ProposalTransfer.ALL_DRAG_OPERATIONS);
		dropTarget.setTransfer(transferTypes);
		dropTarget.addDropListener(new DropNewProposalListListener(highlightComposite, listIndex, fModel, fUtilitiesProxy, fProposalListSection));
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DropTarget;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.PaintEvent;
import org.eclipse.swt.events.PaintListener;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;

import org.eclipse.core.runtime.Assert;

import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedUtilitiesProxy;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.DragProposalListCategoryListener;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.DropIntoProposalListListener;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListCategoryTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProvidedCategoryTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.ModelElement;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.PreferenceModel;

/**
 * 
 * @since 3.8
 */
public final class ProposalList {

	private final class ProposalListTableLabelProvider extends LabelProvider implements ITableLabelProvider {

		/*
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
		 */
		public Image getColumnImage(Object element, int columnIndex) {
			if (columnIndex == 0)
				return ((ModelElement) element).getImage();
			return null;
		}

		/*
		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
		 */
		public String getColumnText(Object element, int columnIndex) {
			switch (columnIndex) {
				case 0:
					return ((ModelElement) element).getName();
				default:
					Assert.isTrue(false);
					return null;
			}
		}
	}

	private final class ProposalListContentProvider implements IStructuredContentProvider {
		private final int fListIndex;

		public ProposalListContentProvider(int listIndex) {
			this.fListIndex= listIndex;
		}

		public void dispose() {
		}

		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		}

		public Object[] getElements(Object inputElement) {
			return fModel.getElements(fListIndex).toArray();
		}
	}

	private final PreferenceModel fModel;

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	private final ProposalListSection fProposalListSection;

	private final Composite fTableContainer;

	private final ProposalListHeader fHeader;

	private final TableViewer fTableViewer;

	private final NewListDropSection fNewListDropSection;

	private boolean fSelected;

	public ProposalList(Composite parent, int listIndex, ProposalListSection proposalListSection, PreferenceModel model, CodeAssistAdvancedUtilitiesProxy utilitiesProxy) {
		this.fModel= model;
		this.fUtilitiesProxy= utilitiesProxy;
		this.fProposalListSection= proposalListSection;

		fTableContainer= createTableContainer(parent);
		fHeader= new ProposalListHeader(fTableContainer, listIndex, fModel, fUtilitiesProxy);
		fTableViewer= createTable(fTableContainer, listIndex);

		fNewListDropSection= new NewListDropSection(parent, listIndex + 1, fModel, fProposalListSection, fUtilitiesProxy);

		addDropSupport(fTableContainer, listIndex);
		addRemoveIconVisibility();
		addBorderPainter(fTableContainer);
	}

	@SuppressWarnings("unchecked")
	public List<ModelElement> getContent() {
		Object obj= fTableViewer.getInput();
		if (obj == null)
			return null;
		return (List<ModelElement>) obj;
	}

	public void clearContent() {
		fTableViewer.setInput(null);
	}

	public void addContent(ModelElement element) {
		List<ModelElement> content= getContent();
		if (content == null)
			content= new ArrayList<ModelElement>();
		content.add(element);
		setContent(content);
	}

	public void setContent(List<ModelElement> elements) {
		fTableViewer.setInput(elements);
	}

	public void activateLastListSpaceBehavior(boolean last) {
		fNewListDropSection.activateLastPositionSpaceBehavior(last);
	}

	public void dispose() {
		fTableContainer.dispose();
		fHeader.dispose();
		fTableViewer.getTable().dispose();
		fNewListDropSection.dispose();
	}

	public void highlight(boolean highlight) {
		if (fSelected == highlight)
			return;
		fSelected= highlight;
		fTableContainer.redraw();

		fHeader.highlight(highlight);
	}

	private Composite createTableContainer(Composite parent) {
		Composite tableContainer= new Composite(parent, SWT.NONE);
		tableContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
		GridLayout layout= new GridLayout();
		layout.marginHeight= 1;
		layout.marginWidth= 1;
		layout.verticalSpacing= 0;
		layout.horizontalSpacing= 0;
		tableContainer.setLayout(layout);
		return tableContainer;
	}

	private TableViewer createTable(Composite tableContainer, final int listIndex) {
		TableViewer tableViewer= createInitialTableViewer(tableContainer);
		TableColumn nameColumn= addFirstColumn(tableViewer);

		ITableLabelProvider labelProvider= setProviderAndComparator(tableViewer, listIndex);
		adjustFirstColumnWidth(nameColumn, tableViewer, labelProvider);

		addDragSupport(tableViewer, listIndex);
		addFocusOutListener(tableViewer);
		addProposalListCategoryRemoveIconCreator(tableViewer, listIndex);

		return tableViewer;
	}

	private void addDropSupport(Composite tableContainer, int listIndex) {
		Transfer[] transferTypes= new Transfer[] { ProvidedCategoryTransfer.getInstance(), ProposalListCategoryTransfer.getInstance(), ProposalListTransfer.getInstance() };
		DropTarget dropTarget= new DropTarget(tableContainer, ProposalTransfer.ALL_DRAG_OPERATIONS);
		dropTarget.setTransfer(transferTypes);
		dropTarget.addDropListener(new DropIntoProposalListListener(this, listIndex, fModel, fUtilitiesProxy, fProposalListSection));
	}

	private void addRemoveIconVisibility() {
		Listener l= new Listener() {
			public void handleEvent(Event e) {
				fHeader.showRemoveIcon();
			}
		};
		this.addListener(SWT.MouseEnter, l);
		this.addListener(SWT.MouseMove, l);
		this.addListener(SWT.MouseExit, new Listener() {
			public void handleEvent(Event e) {
				fHeader.hideRemoveIcon();
			}
		});
	}

	private void addBorderPainter(final Composite tableContainer) {
		tableContainer.addPaintListener(new PaintListener() {
			public void paintControl(PaintEvent e) {
				if (fSelected)
					e.gc.setBackground(CodeAssistAdvancedUtilitiesProxy.SELECTED_COLOR);
				else
					e.gc.setBackground(CodeAssistAdvancedUtilitiesProxy.UNSELECTED_BORDER_COLOR);
				Rectangle rect= tableContainer.getClientArea();
				e.gc.fillRectangle(rect);
			}
		});
	}

	private TableViewer createInitialTableViewer(Composite tableContainer) {
		TableViewer listViewer= new TableViewer(tableContainer, SWT.SINGLE | SWT.NO_SCROLL);
		final Table table= listViewer.getTable();
		table.setHeaderVisible(false);
		table.setLinesVisible(false);
		table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
		return listViewer;
	}

	private TableColumn addFirstColumn(TableViewer tableViewer) {
		TableColumn nameColumn= new TableColumn(tableViewer.getTable(), SWT.NONE);
		nameColumn.setResizable(false);
		return nameColumn;
	}

	private void adjustFirstColumnWidth(TableColumn column, TableViewer tableViewer, ITableLabelProvider labelProvider) {
		final int ICON_WIDTH= 16;
		final int HEADER_MARGIN= 20;
		int minNameWidth= fUtilitiesProxy.computeWidth(tableViewer.getTable(), column.getText()) + HEADER_MARGIN;
		for (int i= 0; i < fModel.elements.size(); i++) {
			minNameWidth= Math.max(minNameWidth, fUtilitiesProxy.computeWidth(tableViewer.getTable(), labelProvider.getColumnText(fModel.elements.get(i), 0)) + 2 * ICON_WIDTH);
		}
		column.setWidth(minNameWidth);
	}

	private ITableLabelProvider setProviderAndComparator(TableViewer tableViewer, int listIndex) {
		tableViewer.setContentProvider(new ProposalListContentProvider(listIndex));
		tableViewer.setComparator(new ModelElement.ModelElementViewerComparator());
		ITableLabelProvider labelProvider= new ProposalListTableLabelProvider();
		tableViewer.setLabelProvider(labelProvider);
		return labelProvider;
	}

	private void addDragSupport(TableViewer tableViewer, int listIndex) {
		Transfer[] transferTypes= new Transfer[] { ProposalListCategoryTransfer.getInstance() };
		tableViewer.addDragSupport(ProposalTransfer.ALL_DRAG_OPERATIONS, transferTypes, new DragProposalListCategoryListener(tableViewer, listIndex));
	}

	private void addFocusOutListener(TableViewer tableViewer) {
		final Table table= tableViewer.getTable();
		table.addListener(SWT.FocusOut, new Listener() {
			public void handleEvent(Event event) {
				table.deselectAll();
			}
		});
	}

	private void addListener(int eventType, Listener listener) {
		fTableContainer.addListener(eventType, listener);
		fHeader.addListener(eventType, listener);
		fTableViewer.getTable().addListener(eventType, listener);
	}

	private void addProposalListCategoryRemoveIconCreator(final TableViewer tableViewer, final int listIndex) {
		Table table= tableViewer.getTable();
		Rectangle iconRect= addRemoveIconToItemsPainter(table);
		addRemoveIconRedrawListener(table, iconRect);
		addRemoveCategoryOnClickListener(table, iconRect, listIndex);
	}

	private Rectangle addRemoveIconToItemsPainter(Table table) {
		final Rectangle iconRect= new Rectangle(0, 0, 0, 0);
		Listener paintListener= new Listener() {
			public void handleEvent(Event event) {
				Table tab= ((Table) event.widget);
				Point tabLoc= getTableLocation(tab);
				Point mouseLoc= getMouseLocation(tab, tabLoc);
				if (isMouseOverCurrentRow(tab, mouseLoc, (TableItem) event.item)) {
					updateIconRectangle(tab, event.height, event.y);
					drawIcon(event.gc, mouseLoc);
				}
			}

			private Point getTableLocation(Table tab) {
				return tab.toDisplay(tab.getClientArea().x, tab.getClientArea().y);
			}

			private Point getMouseLocation(Table tab, Point tabLoc) {
				Point mouseLoc= tab.getDisplay().getCursorLocation();
				mouseLoc= new Point(mouseLoc.x - tabLoc.x, mouseLoc.y - tabLoc.y);
				return mouseLoc;
			}

			private boolean isMouseOverCurrentRow(Table tab, Point mouseLoc, TableItem currentItem) {
				return tab.getClientArea().contains(mouseLoc) && currentItem == getItem(tab, mouseLoc);
			}

			private void updateIconRectangle(Table tab, int eventHeight, int eventY) {
				ImageData imgData= fUtilitiesProxy.fRemoveProposalListImage.getImageData();
				int x= tab.getClientArea().width - imgData.width;
				int offset= Math.max(0, (eventHeight - imgData.height) / 2);

				iconRect.height= imgData.height;
				iconRect.width= imgData.width;
				iconRect.x= x;
				iconRect.y= eventY + offset;
			}

			private void drawIcon(GC gc, Point mouseLoc) {
				gc.setClipping(iconRect);
				if (iconRect.contains(mouseLoc))
					gc.drawImage(fUtilitiesProxy.fRemoveProposalListOverImage, iconRect.x, iconRect.y);
				else
					gc.drawImage(fUtilitiesProxy.fRemoveProposalListImage, iconRect.x, iconRect.y);
			}
		};
		table.addListener(SWT.PaintItem, paintListener);
		return iconRect;
	}

	private void addRemoveIconRedrawListener(final Table table, final Rectangle iconRect) {
		Listener mouseOverTableListener= new Listener() {
			TableItem lastItem;

			boolean lastOverImg;

			public void handleEvent(Event e) {
				TableItem item= getItem(table, new Point(e.x, e.y));
				boolean overImg= iconRect.contains(e.x, e.y);
				if (lastItem != item || lastOverImg != overImg) {
					lastItem= item;
					lastOverImg= overImg;
					table.redraw();
				}
			}
		};
		table.addListener(SWT.MouseEnter, mouseOverTableListener);
		table.addListener(SWT.MouseMove, mouseOverTableListener);
		table.addListener(SWT.MouseExit, mouseOverTableListener);
	}

	private void addRemoveCategoryOnClickListener(final Table table, final Rectangle iconRect, final int listIndex) {
		table.addMouseListener(new MouseListener() {
			public void mouseUp(MouseEvent e) {
				if (isSingleClick(e.count) && isUpOverIcon(e.x, e.y)) {
					int elemIndex= table.indexOf(getItem(table, new Point(e.x, e.y)));
					List<ModelElement> categories= fModel.getElements(listIndex);
					Collections.sort(categories, new ModelElement.ModelElementComparator());
					categories.get(elemIndex).removeInProposalList(listIndex);
					fUtilitiesProxy.updateControls();
				}
			}

			public void mouseDown(MouseEvent e) {
			}

			public void mouseDoubleClick(MouseEvent e) {
			}

			private boolean isSingleClick(int count) {
				return count == 1;
			}

			private boolean isUpOverIcon(int x, int y) {
				return iconRect.contains(x, y);
			}
		});
	}

	private TableItem getItem(Table tab, Point p) {
		for (int index= 0; index < tab.getItemCount(); index++) {
			if (getItemBounds(tab, index).contains(p))
				return tab.getItem(index);
		}
		return null;
	}

	private Rectangle getItemBounds(Table tab, int itemIndex) {
		Rectangle tableBounds= tab.getBounds();
		int height= tab.getItemHeight();
		int width= tableBounds.width;
		int x= tableBounds.x;
		int y= itemIndex * height;
		return new Rectangle(x, y, width, height);
	}

	public TableViewer getTableViewer() {
		return fTableViewer;
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets;

import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DragSource;
import org.eclipse.swt.dnd.DragSourceListener;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;

import org.eclipse.jdt.internal.corext.util.Messages;

import org.eclipse.jdt.internal.ui.preferences.PreferencesMessages;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedUtilitiesProxy;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.DragProposalListListener;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.PreferenceModel;

/**
 * 
 * @since 3.8
 */
public final class ProposalListHeader {

	private static final Color SELECTED_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION);

	private static final Color SELECTED_TEXT_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT);

	private static final Color UNSELECTED_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);

	private static final Color UNSELECTED_TEXT_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);

	private final PreferenceModel fModel;

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	private final Composite fPaddingComposite;

	private final Label fTitle;

	private final Label fRemoveLabel;

	public ProposalListHeader(Composite tableContainer, int listIndex, PreferenceModel model, CodeAssistAdvancedUtilitiesProxy utilitiesProxy) {
		this.fModel= model;
		this.fUtilitiesProxy= utilitiesProxy;

		fPaddingComposite= createPaddingComposite(tableContainer);
		fTitle= createTitle(fPaddingComposite, listIndex);
		fRemoveLabel= createRemoveIcon(fPaddingComposite, listIndex);
		updateHeaderHeight();

		addListDragSupport(fPaddingComposite, listIndex);
		addListDragSupport(fTitle, listIndex);
	}

	public void dispose() {
		fPaddingComposite.dispose();
		fTitle.dispose();
		fRemoveLabel.dispose();
	}

	public void highlight(boolean highlight) {
		Color backgroundColor= highlight ? SELECTED_COLOR : UNSELECTED_COLOR;
		Color foregroundColor= highlight ? SELECTED_TEXT_COLOR : UNSELECTED_TEXT_COLOR;
		fPaddingComposite.setBackground(backgroundColor);
		fTitle.setBackground(backgroundColor);
		fTitle.setForeground(foregroundColor);
		fRemoveLabel.setBackground(backgroundColor);
	}

	public void showRemoveIcon() {
		fRemoveLabel.setVisible(true);
	}

	public void hideRemoveIcon() {
		fRemoveLabel.setVisible(false);
	}

	public void addListener(int eventType, Listener listener) {
		fPaddingComposite.addListener(eventType, listener);
		fTitle.addListener(eventType, listener);
		fRemoveLabel.addListener(eventType, listener);
	}

	private Composite createPaddingComposite(Composite tableContainer) {
		Composite paddingComposite= new Composite(tableContainer, SWT.NONE);
		GridLayout layout= new GridLayout(2, false);
		layout.marginHeight= 0;
		layout.verticalSpacing= 0;
		paddingComposite.setLayout(layout);
		return paddingComposite;
	}

	private Label createTitle(Composite paddingComposite, int listIndex) {
		Label title= new Label(paddingComposite, SWT.NONE);
		title.setText(getProposalListTitle(listIndex));
		title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
		return title;
	}

	private void updateHeaderHeight() {
		GridData gd= new GridData(SWT.FILL, SWT.FILL, true, true);
		gd.heightHint= getHeaderHeight();
		fPaddingComposite.setLayoutData(gd);
	}

	private Label createRemoveIcon(final Composite paddingComposite, final int listIndex) {
		final Label removeLabel= createRemoveLabel(paddingComposite);
		addMouseOverIconListener(removeLabel);
		addRemoveListOnClickListener(removeLabel, listIndex);
		return removeLabel;
	}

	private void addListDragSupport(Control control, int listIndex) {
		DragSourceListener tableDragSourceListener= new DragProposalListListener(listIndex);
		Transfer[] transferTypes= new Transfer[] { ProposalListTransfer.getInstance() };
		DragSource dragSource= new DragSource(control, ProposalTransfer.ALL_DRAG_OPERATIONS);
		dragSource.setTransfer(transferTypes);
		dragSource.addDragListener(tableDragSourceListener);
	}

	private String getProposalListTitle(int index) {
		return Messages.format(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_proposal_list_table_title, Integer.valueOf(index + 1));
	}

	private int getHeaderHeight() {
		return fTitle.computeSize(SWT.DEFAULT, SWT.DEFAULT).y + 8;
	}

	private Label createRemoveLabel(Composite paddingComposite) {
		final Label removeLabel= new Label(paddingComposite, SWT.NONE);
		removeLabel.setVisible(false);
		removeLabel.setImage(fUtilitiesProxy.fRemoveProposalListImage);
		GridData gd= new GridData(SWT.RIGHT, SWT.CENTER, true, true);
		gd.widthHint= fUtilitiesProxy.fRemoveProposalListImage.getImageData().width;
		gd.minimumWidth= gd.widthHint;
		removeLabel.setLayoutData(gd);
		return removeLabel;
	}

	private void addMouseOverIconListener(final Label removeLabel) {
		removeLabel.addListener(SWT.MouseEnter, new Listener() {
			public void handleEvent(Event e) {
				removeLabel.setImage(fUtilitiesProxy.fRemoveProposalListOverImage);
			}
		});
		removeLabel.addListener(SWT.MouseExit, new Listener() {
			public void handleEvent(Event e) {
				removeLabel.setImage(fUtilitiesProxy.fRemoveProposalListImage);
			}
		});
	}

	private void addRemoveListOnClickListener(final Label removeLabel, final int listIndex) {
		removeLabel.addMouseListener(new MouseListener() {
			public void mouseUp(MouseEvent e) {
				if (isSingleClick(e.count) && isUpOverIcon(e.x, e.y)) {
					fModel.removeList(listIndex);
					fUtilitiesProxy.updateControls();
				}
			}

			public void mouseDown(MouseEvent e) {
			}

			public void mouseDoubleClick(MouseEvent e) {
			}

			private boolean isSingleClick(int count) {
				return count == 1;
			}

			private boolean isUpOverIcon(int x, int y) {
				return x >= 0 && x < removeLabel.getBounds().width && y >= 0 && y < removeLabel.getBounds().height;
			}
		});
	}
}




/**
 * Copyright (c) 2011 Thomas Schlosser.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
 */
package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.dnd.DropTarget;
import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;

import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.CodeAssistAdvancedUtilitiesProxy;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.AutoscrollDropTargetListener;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListCategoryTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProvidedCategoryTransfer;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.ModelElement;
import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.PreferenceModel;

/**
 * 
 * @since 3.8
 */
public final class ProposalListSection {
	private final PreferenceModel fModel;

	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;

	private final ScrolledComposite fScrolledComposite;

	private final Composite fInnerWrappingComposite;

	private final List<ProposalList> fProposalLists= new ArrayList<ProposalList>();

	public ProposalListSection(Composite parent, PreferenceModel model, CodeAssistAdvancedUtilitiesProxy utilitiesProxy) {
		this.fModel= model;
		this.fUtilitiesProxy= utilitiesProxy;

		fScrolledComposite= createOuterScrolledComposite(parent);
		addDropAutoScroll(fScrolledComposite);
		fInnerWrappingComposite= createInnerProposalListWrappingComposite(fScrolledComposite);

		addOuterSizeUpdater(fScrolledComposite, fInnerWrappingComposite);

		createFirstNewListDropSection(fInnerWrappingComposite);
	}

	public void updateControls() {
		//FIXME: This fixes the problem of refreshing the first list when first element (category) has been added.
		// This bug only occurs when the configuration page has been opened indirectly.
		// If the "Content Assist"->"Advanced" page is opened directly, it behaves as expected.
		if (fProposalLists.size() == 1 && fProposalLists.get(0).getContent() == null) {
			fProposalLists.get(0).dispose();
			fProposalLists.remove(0);
		}
		clearOldListState();
		Set<Integer> filledLists= updateListStates();
		makeSureFirstListExists();
		adjustAndCleanUp(filledLists);
		reLayoutInnerComposite();
	}

	public void autoScroll(DropTargetEvent event) {
		Rectangle area= fScrolledComposite.getClientArea();
		Point absoluteLocation= fScrolledComposite.toDisplay(1, 1);
		Point origin= fScrolledComposite.getOrigin();
		Rectangle bounds= fInnerWrappingComposite.getBounds();

		int scrollDetectRange= 15;
		int offset= 5;
		if (absoluteLocation.y + scrollDetectRange > event.y)
			origin.y= Math.max(0, origin.y - offset);
		if (absoluteLocation.y + area.height - scrollDetectRange < event.y)
			origin.y= Math.min(bounds.height - area.height, origin.y + offset);
		fScrolledComposite.setOrigin(origin);
	}

	private ScrolledComposite createOuterScrolledComposite(Composite parent) {
		ScrolledComposite scrolledComposite= new ScrolledComposite(parent, SWT.V_SCROLL | SWT.BORDER);
		scrolledComposite.setAlwaysShowScrollBars(true);
		scrolledComposite.setExpandHorizontal(true);
		scrolledComposite.setExpandVertical(true);
		GridData gridData= new GridData(GridData.FILL, GridData.FILL, true, true);
		gridData.heightHint= 0;
		scrolledComposite.setLayoutData(gridData);
		return scrolledComposite;
	}

	private void addDropAutoScroll(Composite composite) {
		Transfer[] transferTypes= new Transfer[] { ProvidedCategoryTransfer.getInstance(), ProposalListCategoryTransfer.getInstance(), ProposalListTransfer.getInstance() };
		DropTarget dropTarget= new DropTarget(composite, ProposalTransfer.ALL_DRAG_OPERATIONS);
		dropTarget.setTransfer(transferTypes);
		dropTarget.addDropListener(new AutoscrollDropTargetListener(this));
	}

	private Composite createInnerProposalListWrappingComposite(ScrolledComposite scrolledComposite) {
		Composite wrappingComposite= new Composite(scrolledComposite, SWT.NONE);
		scrolledComposite.setContent(wrappingComposite);
		GridLayout layout= new GridLayout();
		layout.marginHeight= 0;
		layout.verticalSpacing= 0;
		wrappingComposite.setLayout(layout);
		return wrappingComposite;
	}

	private void addOuterSizeUpdater(final ScrolledComposite scrolledComposite, final Composite innerComposite) {
		innerComposite.addControlListener(new ControlListener() {
			public void controlResized(ControlEvent e) {
				innerComposite.update();
				scrolledComposite.setMinSize(innerComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
				scrolledComposite.layout(true, true);
			}

			public void controlMoved(ControlEvent e) {
			}
		});
	}

	private void createFirstNewListDropSection(Composite innerWrappingComposite) {
		new NewListDropSection(innerWrappingComposite, 0, fModel, this, fUtilitiesProxy);
	}

	private void clearOldListState() {
		for (ProposalList list : fProposalLists)
			list.clearContent();
	}

	private Set<Integer> updateListStates() {
		Set<Integer> filledLists= new HashSet<Integer>();
		for (ModelElement element : fModel.elements) {
			Set<Integer> indices= element.getProposalListIndices();
			if (indices != null) {
				filledLists.addAll(indices);
				for (int index : indices) {
					makeSureListExists(index);
					addElementToList(element, index);
				}
			}
		}
		return filledLists;
	}

	private void makeSureFirstListExists() {
		if (fProposalLists.size() == 0)
			makeSureListExists(0);
	}

	private void adjustAndCleanUp(Set<Integer> filledLists) {
		boolean last= true;
		for (int i= fProposalLists.size() - 1; i >= 0; i--)
			if (i > 0 && !filledLists.contains(Integer.valueOf(i))) {
				fProposalLists.get(i).dispose();
				fProposalLists.remove(i);
			}
			else {
				fProposalLists.get(i).activateLastListSpaceBehavior(last);
				last= false;
			}
	}

	private void reLayoutInnerComposite() {
		fInnerWrappingComposite.pack(true);
		fInnerWrappingComposite.layout(false);
	}

	private void addElementToList(ModelElement element, int listIndex) {
		fProposalLists.get(listIndex).addContent(element);
	}

	private void makeSureListExists(int listIndex) {
		while (fProposalLists.size() < listIndex + 1)
			fProposalLists.add(new ProposalList(fInnerWrappingComposite, fProposalLists.size(), this, fModel, fUtilitiesProxy));
	}
}




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.text.java;

import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;

import org.osgi.framework.Bundle;


	/** The image descriptor for this category, or <code>null</code> if none specified. */
	private final ImageDescriptor fImage;

	private final Set<Integer> fProposalListIndices = new HashSet<Integer>();
	private final Set<Integer> fPublicProposalListIndices= Collections.unmodifiableSet(fProposalListIndices);
	private boolean fIsEnabled= true;
	private boolean fIsIncluded= true;
	private final CompletionProposalComputerRegistry fRegistry;

	private int fSortOrder= 0xffff - 1;
	private String fLastError= null;

	CompletionProposalCategory(IConfigurationElement element, CompletionProposalComputerRegistry registry) throws CoreException {

	}

	/**
	 * Adds the given proposal list index to the proposal list indices of this category.
	 * 
	 * @param listIndex the index of the proposal list.
	 */
	public void addProposalListIndex(Integer listIndex) {
		fProposalListIndices.add(listIndex);
	}

	/**
	 * Adds all given proposal list indices to the proposal list indices of this category.
	 * 
	 * @param listIndices the indices of the proposal lists.
	 */
	public void addAllProposalListIndices(Collection<Integer> listIndices) {
		if (listIndices == null)
			return;
		fProposalListIndices.addAll(listIndices);
	}

	/**
	 * Removes all given proposal list indices from the proposal list indices of this category.
	 * 
	 * @param listIndices the indices of the proposal lists.
	 */
	public void removeAllProposalListIndices(Collection<Integer> listIndices) {
		if (listIndices == null)
			return;
		fProposalListIndices.removeAll(listIndices);
	}

	/**
	 * Clears the list of proposal list indices of this category.
	 * 
	 */
	public void clearProposalListIndices() {
		fProposalListIndices.clear();
	}

	/**
	 * Returns the indices of the proposal lists of this category.
	 * <p>
	 * The returned set is read-only.
	 * </p>
	 * 
	 * @return the indices of the proposal lists of this category
	 */
	public Set<Integer> getProposalListIndices() {
		return fPublicProposalListIndices;
	}

	public boolean isEnabled() {

	}

	/**
	 * @return sortOrder
	 */
	public int getSortOrder() {
		return fSortOrder;
	}

	/**
	 * @param sortOrder the sortOrder
	 */
	public void setSortOrder(int sortOrder) {
		fSortOrder= sortOrder;
	}

	/**
	 * Safely computes completion proposals of all computers of this category through their
	 * extension. If an extension is disabled, throws an exception or otherwise does not adhere to
	 * the contract described in {@link IJavaCompletionProposalComputer}, it is disabled.

		List<CompletionProposalComputerDescriptor> descriptors= new ArrayList<CompletionProposalComputerDescriptor>(fRegistry.getProposalComputerDescriptors(partition));
		for (Iterator<CompletionProposalComputerDescriptor> it= descriptors.iterator(); it.hasNext();) {
			CompletionProposalComputerDescriptor desc= it.next();
			if (desc.getCategory() == this && !fProposalListIndices.isEmpty())
				result.addAll(desc.computeContextInformation(context, monitor));
			if (fLastError == null)
				fLastError= desc.getErrorMessage();

Lines 7-12 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/java/CompletionProposalComputerRegistry.java (-40 / +49 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui.text.java;	12	package org.eclipse.jdt.internal.ui.text.java;
12		13
Lines 21-26 Link Here
21	import java.util.Map;	22	import java.util.Map;
22	import java.util.Set;	23	import java.util.Set;
23	import java.util.StringTokenizer;	24	import java.util.StringTokenizer;
		25	import java.util.TreeMap;
		26	import java.util.Map.Entry;
24		27
25	import org.eclipse.swt.SWT;	28	import org.eclipse.swt.SWT;
26	import org.eclipse.swt.events.SelectionAdapter;	29	import org.eclipse.swt.events.SelectionAdapter;
Lines 330-354 Link Here
330		333
331	private List<CompletionProposalCategory> getCategories(List<IConfigurationElement> elements) {	334	private List<CompletionProposalCategory> getCategories(List<IConfigurationElement> elements) {
332	IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();	335	IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
333	String preference= store.getString(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES);	336	String preference= store.getString(PreferenceConstants.CODEASSIST_PROPOSAL_LISTS);
334	Set<String> disabled= new HashSet<String>();	337	Map<String, Set<Integer>> proposalLists= new HashMap<String, Set<Integer>>();
335	StringTokenizer tok= new StringTokenizer(preference, "\0"); //$NON-NLS-1$	338	StringTokenizer tok= new StringTokenizer(preference, "\0"); //$NON-NLS-1$
336	while (tok.hasMoreTokens())	339	for (int i= 0; tok.hasMoreTokens(); i++) {
337	disabled.add(tok.nextToken());
338	Map<String, Integer> ordered= new HashMap<String, Integer>();
339	preference= store.getString(PreferenceConstants.CODEASSIST_CATEGORY_ORDER);
340	tok= new StringTokenizer(preference, "\0"); //$NON-NLS-1$
341	while (tok.hasMoreTokens()) {
342	StringTokenizer inner= new StringTokenizer(tok.nextToken(), ":"); //$NON-NLS-1$	340	StringTokenizer inner= new StringTokenizer(tok.nextToken(), ":"); //$NON-NLS-1$
343	String id= inner.nextToken();	341	if (inner.countTokens() == 0)
344	int rank= Integer.parseInt(inner.nextToken());	342	i--;
345	ordered.put(id, new Integer(rank));	343	while (inner.hasMoreTokens()) {
		344	String categoryId= inner.nextToken();
		345	Set<Integer> set= proposalLists.get(categoryId);
		346	if (set == null) {
		347	set= new HashSet<Integer>();
		348	proposalLists.put(categoryId, set);
		349	}
		350	set.add(Integer.valueOf(i));
		351	}
346	}	352	}
347		353
348	CompletionProposalCategory allProposals= null;	354	CompletionProposalCategory allProposals= null;
349	CompletionProposalCategory typeProposals= null;	355	CompletionProposalCategory typeProposals= null;
350	CompletionProposalCategory allButTypeProposals= null;	356	CompletionProposalCategory allButTypeProposals= null;
351		357
352	List<CompletionProposalCategory> categories= new ArrayList<CompletionProposalCategory>();	358	List<CompletionProposalCategory> categories= new ArrayList<CompletionProposalCategory>();
353	for (Iterator<IConfigurationElement> iter= elements.iterator(); iter.hasNext();) {	359	for (Iterator<IConfigurationElement> iter= elements.iterator(); iter.hasNext();) {
354	IConfigurationElement element= iter.next();	360	IConfigurationElement element= iter.next();
Lines 358-374 Link Here
358		364
359	CompletionProposalCategory category= new CompletionProposalCategory(element, this);	365	CompletionProposalCategory category= new CompletionProposalCategory(element, this);
360	categories.add(category);	366	categories.add(category);
361	category.setIncluded(!disabled.contains(category.getId()));	367	category.addAllProposalListIndices(proposalLists.get(category.getId()));
362	Integer rank= ordered.get(category.getId());	368
363	if (rank != null) {
364	int r= rank.intValue();
365	boolean separate= r < 0xffff;
366	if (!separate)
367	r= r - 0xffff;
368	category.setSeparateCommand(separate);
369	category.setSortOrder(r);
370	}
371
372	String id= category.getId();	369	String id= category.getId();
373	if ("org.eclipse.jdt.ui.javaAllProposalCategory".equals(id)) //$NON-NLS-1$	370	if ("org.eclipse.jdt.ui.javaAllProposalCategory".equals(id)) //$NON-NLS-1$
374	allProposals= category;	371	allProposals= category;
Lines 383-389 Link Here
383	* some other reason. Do not include the extension in the list and inform the user	380	* some other reason. Do not include the extension in the list and inform the user
384	* about it.	381	* about it.
385	*/	382	*/
386	Object[] args= {element.toString()};	383	Object[] args= { element.toString() };
387	String message= Messages.format(JavaTextMessages.CompletionProposalComputerRegistry_invalid_message, args);	384	String message= Messages.format(JavaTextMessages.CompletionProposalComputerRegistry_invalid_message, args);
388	IStatus status= new Status(IStatus.WARNING, JavaPlugin.getPluginId(), IStatus.OK, message, x);	385	IStatus status= new Status(IStatus.WARNING, JavaPlugin.getPluginId(), IStatus.OK, message, x);
389	informUser(status);	386	informUser(status);
Lines 391-425 Link Here
391	informUser(x.getStatus());	388	informUser(x.getStatus());
392	}	389	}
393	}	390	}
394	preventDuplicateCategories(store, disabled, allProposals, typeProposals, allButTypeProposals);	391	preventDuplicateCategories(store, proposalLists, allProposals, typeProposals, allButTypeProposals, categories.size());
395	return categories;	392	return categories;
396	}	393	}
397		394
398	private void preventDuplicateCategories(IPreferenceStore store, Set<String> disabled, CompletionProposalCategory allProposals, CompletionProposalCategory typeProposals,	395	private void preventDuplicateCategories(IPreferenceStore store, Map<String, Set<Integer>> proposalLists, CompletionProposalCategory allProposals, CompletionProposalCategory typeProposals,
399	CompletionProposalCategory allButTypeProposals) {	396	CompletionProposalCategory allButTypeProposals, int numberOfCategories) {
400	boolean adjusted= false;	397	boolean adjusted= false;
401	if (allProposals == null \|\| !allProposals.isIncluded())	398	if (allProposals == null \|\| allProposals.getProposalListIndices().isEmpty())
402	return;	399	return;
403		400
404	if (allButTypeProposals != null && allButTypeProposals.isIncluded()) {	401	if (allButTypeProposals != null && !allButTypeProposals.getProposalListIndices().isEmpty()) {
405	allButTypeProposals.setIncluded(false);	402	allButTypeProposals.removeAllProposalListIndices(allProposals.getProposalListIndices());
406	disabled.add(allButTypeProposals.getId());	403	proposalLists.put(allButTypeProposals.getId(), allButTypeProposals.getProposalListIndices());
407	adjusted= true;	404	adjusted= true;
408	}	405	}
409	if (typeProposals != null && typeProposals.isIncluded()) {	406	if (typeProposals != null && !typeProposals.getProposalListIndices().isEmpty()) {
410	typeProposals.setIncluded(false);	407	typeProposals.removeAllProposalListIndices(allProposals.getProposalListIndices());
411	disabled.add(typeProposals.getId());	408	proposalLists.put(typeProposals.getId(), typeProposals.getProposalListIndices());
412	adjusted= true;	409	adjusted= true;
413	}	410	}
414		411
415	if (adjusted) {	412	if (adjusted) {
416	StringBuffer buf= new StringBuffer(50 * disabled.size());	413	int initialBufferSize= 50 * numberOfCategories;
417	Iterator<String> iter= disabled.iterator();	414	Map<Integer, StringBuffer> proposalListsCategories= new TreeMap<Integer, StringBuffer>();
418	while (iter.hasNext()) {	415	for (Entry<String, Set<Integer>> category : proposalLists.entrySet()) {
419	buf.append(iter.next());	416	for (Integer index : category.getValue()) {
		417	StringBuffer buf= proposalListsCategories.get(index);
		418	if (buf == null) {
		419	buf= new StringBuffer(initialBufferSize);
		420	proposalListsCategories.put(index, buf);
		421	}
		422	buf.append(category.getKey());
		423	buf.append(':');
		424	}
		425	}
		426	StringBuffer buf= new StringBuffer(initialBufferSize * proposalListsCategories.size());
		427	for (StringBuffer proposalList : proposalListsCategories.values()) {
		428	buf.append(proposalList);
420	buf.append('\0');	429	buf.append('\0');
421	}	430	}
422	store.putValue(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES, buf.toString());	431	store.putValue(PreferenceConstants.CODEASSIST_PROPOSAL_LISTS, buf.toString());
423	}	432	}
424	}	433	}
425		434




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
 *******************************************************************************/
package org.eclipse.jdt.internal.ui.text.java;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;

	 */
	private static final String PREF_WARN_ABOUT_EMPTY_ASSIST_CATEGORY= "EmptyDefaultAssistCategory"; //$NON-NLS-1$

	private static final Comparator<CompletionProposalCategory> ORDER_COMPARATOR= new Comparator<CompletionProposalCategory>() {

		public int compare(CompletionProposalCategory d1, CompletionProposalCategory d2) {
			return d1.getSortOrder() - d2.getSortOrder();
		}

	};

	private final List<CompletionProposalCategory> fCategories;
	private final String fPartition;
	private final ContentAssistant fAssistant;

	}

	private List<List<CompletionProposalCategory>> getCategoryIteration() {
		List<List<CompletionProposalCategory>> categories= getProposalCategoriesUnchecked();
		if (fComputerRegistry.hasUninstalledComputers(fPartition, categories.get(0))) {
			if (informUserAboutEmptyFirstProposalCategory())
				// preferences were restored - recompute the categories in the first proposal list
				categories= getProposalCategoriesUnchecked();
		}
		return sequence;
	}

	private List<CompletionProposalCategory> getDefaultCategories() {
		// default mix - enable all included computers
		List<CompletionProposalCategory> included= getDefaultCategoriesUnchecked();

		if (fComputerRegistry.hasUninstalledComputers(fPartition, included)) {
			if (informUserAboutEmptyDefaultCategory())
				// preferences were restored - recompute the default categories
				included= getDefaultCategoriesUnchecked();
			fComputerRegistry.resetUnistalledComputers();
		}
		return categories;
		return included;
	}

	private List<List<CompletionProposalCategory>> getProposalCategoriesUnchecked() {
		Map<Integer, List<CompletionProposalCategory>> sorted= new TreeMap<Integer, List<CompletionProposalCategory>>();
		for (CompletionProposalCategory category : fCategories) {
			if (!category.getProposalListIndices().isEmpty() && category.hasComputers(fPartition)) {
				for (Integer index : category.getProposalListIndices()) {
					List<CompletionProposalCategory> list= sorted.get(index);
					if (list == null) {
						list= new ArrayList<CompletionProposalCategory>();
						sorted.put(index, list);
					}
					list.add(category);
				}
			}
		}
		// put at least an empty first list
		if (sorted.isEmpty())
			sorted.put(Integer.valueOf(0), new ArrayList<CompletionProposalCategory>());
		return new ArrayList<List<CompletionProposalCategory>>(sorted.values());
	}

	/**
	 * Informs the user about the fact that there are no enabled categories in the first content
	 * assist proposal list set and shows a link to the preferences.
	 * 
	 * @return <code>true</code> if the default should be restored
	 * @since 3.3
	 */
	private boolean informUserAboutEmptyFirstProposalCategory() {
		if (OptionalMessageDialog.isDialogEnabled(PREF_WARN_ABOUT_EMPTY_ASSIST_CATEGORY)) {
			final Shell shell= JavaPlugin.getActiveWorkbenchShell();
			String title= JavaTextMessages.ContentAssistProcessor_all_disabled_title;

	        if (restoreId == returnValue || settingsId == returnValue) {
	        	if (restoreId == returnValue) {
	        		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
					store.setToDefault(PreferenceConstants.CODEASSIST_PROPOSAL_LISTS);
	        		store.setToDefault(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES);
	        	}
	        	if (settingsId == returnValue)
					PreferencesUtil.createPreferenceDialogOn(shell, "org.eclipse.jdt.ui.preferences.CodeAssistPreferenceAdvanced", null, null).open(); //$NON-NLS-1$

		return false;
	}

	private List<CompletionProposalCategory> getSeparateCategories() {
		ArrayList<CompletionProposalCategory> sorted= new ArrayList<CompletionProposalCategory>();
		for (Iterator<CompletionProposalCategory> it= fCategories.iterator(); it.hasNext();) {
			CompletionProposalCategory category= it.next();
			if (category.isSeparateCommand() && category.hasComputers(fPartition))
				sorted.add(category);
		}
		Collections.sort(sorted, ORDER_COMPARATOR);
		return sorted;
	}

	private String createEmptyMessage() {
		return Messages.format(JavaTextMessages.ContentAssistProcessor_empty_message, new String[]{getCategoryLabel(fRepetition)});
	}


	private String getCategoryLabel(int repetition) {
		int iteration= repetition % fCategoryIteration.size();
		return Messages.format(JavaTextMessages.ContentAssistProcessor_proposalList, Integer.valueOf(iteration + 1));
			return JavaTextMessages.ContentAssistProcessor_defaultProposalCategory;
		return toString(fCategoryIteration.get(iteration).get(0));
	}

	private String toString(CompletionProposalCategory category) {
		return category.getDisplayName();
	}

	private String getIterationGesture() {

Lines 7-12 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/java/JavaTextMessages.java (-1 / +2 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui.text.java;	12	package org.eclipse.jdt.internal.ui.text.java;
12		13
Lines 59-65 Link Here
59	public static String CompletionProposalComputerDescriptor_blame_message;	60	public static String CompletionProposalComputerDescriptor_blame_message;
60	public static String CompletionProposalComputerRegistry_invalid_message;	61	public static String CompletionProposalComputerRegistry_invalid_message;
61	public static String CompletionProposalComputerRegistry_error_dialog_title;	62	public static String CompletionProposalComputerRegistry_error_dialog_title;
62	public static String ContentAssistProcessor_defaultProposalCategory;	63	public static String ContentAssistProcessor_proposalList;
63	public static String ContentAssistProcessor_toggle_affordance_press_gesture;	64	public static String ContentAssistProcessor_toggle_affordance_press_gesture;
64	public static String ContentAssistProcessor_toggle_affordance_click_gesture;	65	public static String ContentAssistProcessor_toggle_affordance_click_gesture;
65	public static String ContentAssistProcessor_toggle_affordance_update_message;	66	public static String ContentAssistProcessor_toggle_affordance_update_message;




#
# Contributors:
#     IBM Corporation - initial API and implementation
#     Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
###############################################################################

CompletionProcessor_error_accessing_title=Error Accessing Compilation Unit

ContentAssistProcessor_all_disabled_preference_link=Change the settings on the <a>Advanced Content Assist preference page</a> or click ''{0}'' to restore the default behavior.
ContentAssistProcessor_collecting_contexts=Collecting context information
ContentAssistProcessor_sorting_contexts=Sorting
ContentAssistProcessor_proposalList={0}. Proposal List
# {0} will be replaced by a keyboard shortcut (accelerator)
ContentAssistProcessor_toggle_affordance_press_gesture=Press ''{0}''
ContentAssistProcessor_toggle_affordance_click_gesture=Click
# {0} will be replaced by a title describing the displayed proposal category, {1} by either the press_gesture or click_gesture message above, {2} by the name of the next proposal category 
ContentAssistProcessor_toggle_affordance_update_message={1} to show {2}
# {0} will be replaced by a title describing the displayed proposal category
ContentAssistProcessor_empty_message= No proposals in {0}

ContentAssistHistory_serialize_error=Problems writing content assist history to XML
ContentAssistHistory_deserialize_error=Problems reading content assist history from XML




 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Guven Demir <guven.internet+eclipse@gmail.com> - [package explorer] Alternative package name shortening: abbreviation - https://bugs.eclipse.org/bugs/show_bug.cgi?id=299514
 *     Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
 *******************************************************************************/
package org.eclipse.jdt.ui;

import java.util.Arrays;
import java.util.Locale;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map.Entry;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.TreeMap;

import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.RGB;

	 * Value is of type <code>String</code>, a "\0"-separated list of identifiers.
	 * </p>
	 *
	 * @see #getExcludedCompletionProposalCategories()
	 * @see #setExcludedCompletionProposalCategories(String[])
	 * @since 3.2
	 * @deprecated As of 3.8, use {@link #CODEASSIST_PROPOSAL_LISTS} instead
	 */
	public static final String CODEASSIST_EXCLUDED_CATEGORIES= "content_assist_disabled_computers"; //$NON-NLS-1$


	 * </p>
	 * 
	 * @since 3.2
	 * @deprecated As of 3.8, use {@link #CODEASSIST_PROPOSAL_LISTS} instead
	 */
	public static final String CODEASSIST_CATEGORY_ORDER= "content_assist_category_order"; //$NON-NLS-1$
	
	/**
	 * A named preference that controls which completion proposal category is included in which proposal list.
	 * <p>
	 * Value is of type <code>String</code>, a "\0"-separated list of "\1"-separated lists with categoryId where
	 * <ul>
	 * <li>categoryId is the <code>String</code> holding the category ID</li>
	 * </ul>
	 * 
	 * </p>
	 * 
	 * @see #getProposalLists()
	 * @see #setProposalLists(Map)
	 * @since 3.8
	 */
	public static final String CODEASSIST_PROPOSAL_LISTS= "content_assist_proposal_lists"; //$NON-NLS-1$

	/**
	 * A named preference that controls whether folding is enabled in the Java editor.

		store.setDefault(PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES, true);
		store.setDefault(PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS, false);
		store.setDefault(PreferenceConstants.CODEASSIST_PREFIX_COMPLETION, false);
		store.setDefault(PreferenceConstants.CODEASSIST_PROPOSAL_LISTS, "org.eclipse.jdt.ui.templateProposalCategory:org.eclipse.jdt.ui.swtProposalCategory:org.eclipse.jdt.ui.javaAllProposalCategory:org.eclipse.pde.api.tools.ui.apitools_proposal_category:\0org.eclipse.jdt.ui.templateProposalCategory:\0org.eclipse.jdt.ui.swtProposalCategory:\0org.eclipse.pde.api.tools.ui.apitools_proposal_category:\0"); //$NON-NLS-1$
		store.setDefault(PreferenceConstants.CODEASSIST_CATEGORY_ORDER, "org.eclipse.jdt.ui.spellingProposalCategory:65545\0org.eclipse.jdt.ui.javaTypeProposalCategory:65540\0org.eclipse.jdt.ui.javaNoTypeProposalCategory:65539\0org.eclipse.jdt.ui.textProposalCategory:65541\0org.eclipse.jdt.ui.javaAllProposalCategory:65542\0org.eclipse.jdt.ui.templateProposalCategory:2\0org.eclipse.jdt.ui.swtProposalCategory:3\0"); //$NON-NLS-1$
		store.setDefault(PreferenceConstants.CODEASSIST_LRU_HISTORY, ""); //$NON-NLS-1$
		store.setDefault(PreferenceConstants.CODEASSIST_SORTER, "org.eclipse.jdt.ui.RelevanceSorter"); //$NON-NLS-1$
		store.setDefault(PreferenceConstants.CODEASSIST_FAVORITE_STATIC_MEMBERS, ""); //$NON-NLS-1$

	}

	/**
	 * Returns the completion proposal categories with their corresponding proposal list indices.
	 * 
	 * @return a map which maps the category IDs to a set of proposal list indices
	 * @see #CODEASSIST_PROPOSAL_LISTS
	 * @since 3.8
	 */
	public static Map<String, Set<Integer>> getProposalLists() {
		String encodedPreference= getPreference(CODEASSIST_PROPOSAL_LISTS, null);
		Map<String, Set<Integer>> result= new HashMap<String, Set<Integer>>();
		StringTokenizer tok= new StringTokenizer(encodedPreference, "\0"); //$NON-NLS-1$
		for (int i= 0; tok.hasMoreTokens(); i++) {
			StringTokenizer inner= new StringTokenizer(tok.nextToken(), ":"); //$NON-NLS-1$
			if (inner.countTokens() == 0)
				i--;
			while (inner.hasMoreTokens()) {
				String category= inner.nextToken();
				Set<Integer> set= result.get(category);
				if (set == null) {
					set= new HashSet<Integer>();
					result.put(category, set);
				}
				set.add(Integer.valueOf(i));
			}
		}
		return result;
	}

	/**
	 * Sets the completion proposal categories for each proposal list and reloads the registry.
	 * 
	 * @param proposalLists a map which maps the category IDs to a set of proposal list indices
	 * @see #CODEASSIST_PROPOSAL_LISTS
	 * @since 3.8
	 */
	public static void setProposalLists(Map<String, Set<Integer>> proposalLists) {
		Assert.isLegal(proposalLists != null);
		int initialBufferSize= 250;
		Map<Integer, StringBuffer> proposalListsCategories= new TreeMap<Integer, StringBuffer>();
		for (Entry<String, Set<Integer>> category : proposalLists.entrySet()) {
			for (Integer index : category.getValue()) {
				StringBuffer buf= proposalListsCategories.get(index);
				if (buf == null) {
					buf= new StringBuffer(initialBufferSize);
					proposalListsCategories.put(index, buf);
				}
				buf.append(category.getKey());
				buf.append(":"); //$NON-NLS-1$
			}
		}
		StringBuffer buf= new StringBuffer(initialBufferSize * proposalListsCategories.size());
		for (StringBuffer proposalList : proposalListsCategories.values()) {
			buf.append(proposalList);
			buf.append("\0"); //$NON-NLS-1$
		}
		getPreferenceStore().setValue(CODEASSIST_PROPOSAL_LISTS, buf.toString());
		CompletionProposalComputerRegistry.getDefault().reload();
	}


Return to bug 340876

Lines 7-20 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/java/ContentAssistProcessor.java (-61 / +33 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui.text.java;	12	package org.eclipse.jdt.internal.ui.text.java;
12		13
13	import java.util.ArrayList;	14	import java.util.ArrayList;
14	import java.util.Collections;
15	import java.util.Comparator;
16	import java.util.Iterator;	15	import java.util.Iterator;
17	import java.util.List;	16	import java.util.List;
		17	import java.util.Map;
		18	import java.util.TreeMap;
18		19
19	import org.eclipse.swt.SWT;	20	import org.eclipse.swt.SWT;
20	import org.eclipse.swt.events.SelectionAdapter;	21	import org.eclipse.swt.events.SelectionAdapter;
Lines 186-199 Link Here
186	*/	187	*/
187	private static final String PREF_WARN_ABOUT_EMPTY_ASSIST_CATEGORY= "EmptyDefaultAssistCategory"; //$NON-NLS-1$	188	private static final String PREF_WARN_ABOUT_EMPTY_ASSIST_CATEGORY= "EmptyDefaultAssistCategory"; //$NON-NLS-1$
188		189
189	private static final Comparator<CompletionProposalCategory> ORDER_COMPARATOR= new Comparator<CompletionProposalCategory>() {
190
191	public int compare(CompletionProposalCategory d1, CompletionProposalCategory d2) {
192	return d1.getSortOrder() - d2.getSortOrder();
193	}
194
195	};
196
197	private final List<CompletionProposalCategory> fCategories;	190	private final List<CompletionProposalCategory> fCategories;
198	private final String fPartition;	191	private final String fPartition;
199	private final ContentAssistant fAssistant;	192	private final ContentAssistant fAssistant;
Lines 444-490 Link Here
444	}	437	}
445		438
446	private List<List<CompletionProposalCategory>> getCategoryIteration() {	439	private List<List<CompletionProposalCategory>> getCategoryIteration() {
447	List<List<CompletionProposalCategory>> sequence= new ArrayList<List<CompletionProposalCategory>>();	440	List<List<CompletionProposalCategory>> categories= getProposalCategoriesUnchecked();
448	sequence.add(getDefaultCategories());	441	if (fComputerRegistry.hasUninstalledComputers(fPartition, categories.get(0))) {
449	for (Iterator<CompletionProposalCategory> it= getSeparateCategories().iterator(); it.hasNext();) {	442	if (informUserAboutEmptyFirstProposalCategory())
450	CompletionProposalCategory cat= it.next();	443	// preferences were restored - recompute the categories in the first proposal list
451	sequence.add(Collections.singletonList(cat));	444	categories= getProposalCategoriesUnchecked();
452	}
453	return sequence;
454	}
455
456	private List<CompletionProposalCategory> getDefaultCategories() {
457	// default mix - enable all included computers
458	List<CompletionProposalCategory> included= getDefaultCategoriesUnchecked();
459
460	if (fComputerRegistry.hasUninstalledComputers(fPartition, included)) {
461	if (informUserAboutEmptyDefaultCategory())
462	// preferences were restored - recompute the default categories
463	included= getDefaultCategoriesUnchecked();
464	fComputerRegistry.resetUnistalledComputers();	445	fComputerRegistry.resetUnistalledComputers();
465	}	446	}
466		447	return categories;
467	return included;
468	}	448	}
469		449
470	private List<CompletionProposalCategory> getDefaultCategoriesUnchecked() {	450	private List<List<CompletionProposalCategory>> getProposalCategoriesUnchecked() {
471	List<CompletionProposalCategory> included= new ArrayList<CompletionProposalCategory>();	451	Map<Integer, List<CompletionProposalCategory>> sorted= new TreeMap<Integer, List<CompletionProposalCategory>>();
472	for (Iterator<CompletionProposalCategory> it= fCategories.iterator(); it.hasNext();) {	452	for (CompletionProposalCategory category : fCategories) {
473	CompletionProposalCategory category= it.next();	453	if (!category.getProposalListIndices().isEmpty() && category.hasComputers(fPartition)) {
474	if (category.isIncluded() && category.hasComputers(fPartition))	454	for (Integer index : category.getProposalListIndices()) {
475	included.add(category);	455	List<CompletionProposalCategory> list= sorted.get(index);
		456	if (list == null) {
		457	list= new ArrayList<CompletionProposalCategory>();
		458	sorted.put(index, list);
		459	}
		460	list.add(category);
		461	}
		462	}
476	}	463	}
477	return included;	464	// put at least an empty first list
		465	if (sorted.isEmpty())
		466	sorted.put(Integer.valueOf(0), new ArrayList<CompletionProposalCategory>());
		467	return new ArrayList<List<CompletionProposalCategory>>(sorted.values());
478	}	468	}
479		469
480	/**	470	/**
481	* Informs the user about the fact that there are no enabled categories in the default content	471	* Informs the user about the fact that there are no enabled categories in the first content
482	* assist set and shows a link to the preferences.	472	* assist proposal list set and shows a link to the preferences.
483	*	473	*
484	* @return <code>true</code> if the default should be restored	474	* @return <code>true</code> if the default should be restored
485	* @since 3.3	475	* @since 3.3
486	*/	476	*/
487	private boolean informUserAboutEmptyDefaultCategory() {	477	private boolean informUserAboutEmptyFirstProposalCategory() {
488	if (OptionalMessageDialog.isDialogEnabled(PREF_WARN_ABOUT_EMPTY_ASSIST_CATEGORY)) {	478	if (OptionalMessageDialog.isDialogEnabled(PREF_WARN_ABOUT_EMPTY_ASSIST_CATEGORY)) {
489	final Shell shell= JavaPlugin.getActiveWorkbenchShell();	479	final Shell shell= JavaPlugin.getActiveWorkbenchShell();
490	String title= JavaTextMessages.ContentAssistProcessor_all_disabled_title;	480	String title= JavaTextMessages.ContentAssistProcessor_all_disabled_title;
Lines 549-556 Link Here
549	if (restoreId == returnValue \|\| settingsId == returnValue) {	539	if (restoreId == returnValue \|\| settingsId == returnValue) {
550	if (restoreId == returnValue) {	540	if (restoreId == returnValue) {
551	IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();	541	IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
552	store.setToDefault(PreferenceConstants.CODEASSIST_CATEGORY_ORDER);	542	store.setToDefault(PreferenceConstants.CODEASSIST_PROPOSAL_LISTS);
553	store.setToDefault(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES);
554	}	543	}
555	if (settingsId == returnValue)	544	if (settingsId == returnValue)
556	PreferencesUtil.createPreferenceDialogOn(shell, "org.eclipse.jdt.ui.preferences.CodeAssistPreferenceAdvanced", null, null).open(); //$NON-NLS-1$	545	PreferencesUtil.createPreferenceDialogOn(shell, "org.eclipse.jdt.ui.preferences.CodeAssistPreferenceAdvanced", null, null).open(); //$NON-NLS-1$
Lines 561-577 Link Here
561	return false;	550	return false;
562	}	551	}
563		552
564	private List<CompletionProposalCategory> getSeparateCategories() {
565	ArrayList<CompletionProposalCategory> sorted= new ArrayList<CompletionProposalCategory>();
566	for (Iterator<CompletionProposalCategory> it= fCategories.iterator(); it.hasNext();) {
567	CompletionProposalCategory category= it.next();
568	if (category.isSeparateCommand() && category.hasComputers(fPartition))
569	sorted.add(category);
570	}
571	Collections.sort(sorted, ORDER_COMPARATOR);
572	return sorted;
573	}
574
575	private String createEmptyMessage() {	553	private String createEmptyMessage() {
576	return Messages.format(JavaTextMessages.ContentAssistProcessor_empty_message, new String[]{getCategoryLabel(fRepetition)});	554	return Messages.format(JavaTextMessages.ContentAssistProcessor_empty_message, new String[]{getCategoryLabel(fRepetition)});
577	}	555	}
Lines 582-594 Link Here
582		560
583	private String getCategoryLabel(int repetition) {	561	private String getCategoryLabel(int repetition) {
584	int iteration= repetition % fCategoryIteration.size();	562	int iteration= repetition % fCategoryIteration.size();
585	if (iteration == 0)	563	return Messages.format(JavaTextMessages.ContentAssistProcessor_proposalList, Integer.valueOf(iteration + 1));
586	return JavaTextMessages.ContentAssistProcessor_defaultProposalCategory;
587	return toString(fCategoryIteration.get(iteration).get(0));
588	}
589
590	private String toString(CompletionProposalCategory category) {
591	return category.getDisplayName();
592	}	564	}
593		565
594	private String getIterationGesture() {	566	private String getIterationGesture() {

Lines 8-19 Link Here

(-)ui/org/eclipse/jdt/ui/PreferenceConstants.java (-31 / +76 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Guven Demir <guven.internet+eclipse@gmail.com> - [package explorer] Alternative package name shortening: abbreviation - https://bugs.eclipse.org/bugs/show_bug.cgi?id=299514	10	* Guven Demir <guven.internet+eclipse@gmail.com> - [package explorer] Alternative package name shortening: abbreviation - https://bugs.eclipse.org/bugs/show_bug.cgi?id=299514
		11	* Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.jdt.ui;	13	package org.eclipse.jdt.ui;
13		14
14	import java.util.Arrays;	15	import java.util.Arrays;
15	import java.util.Locale;	16	import java.util.Locale;
		17	import java.util.HashMap;
		18	import java.util.HashSet;
		19	import java.util.Map.Entry;
		20	import java.util.Map;
		21	import java.util.Set;
16	import java.util.StringTokenizer;	22	import java.util.StringTokenizer;
		23	import java.util.TreeMap;
17		24
18	import org.eclipse.swt.SWT;	25	import org.eclipse.swt.SWT;
19	import org.eclipse.swt.graphics.RGB;	26	import org.eclipse.swt.graphics.RGB;
Lines 3174-3182 Link Here
3174	* Value is of type <code>String</code>, a "\0"-separated list of identifiers.	3181	* Value is of type <code>String</code>, a "\0"-separated list of identifiers.
3175	* </p>	3182	* </p>
3176	*	3183	*
3177	* @see #getExcludedCompletionProposalCategories()
3178	* @see #setExcludedCompletionProposalCategories(String[])
3179	* @since 3.2	3184	* @since 3.2
		3185	* @deprecated As of 3.8, use {@link #CODEASSIST_PROPOSAL_LISTS} instead
3180	*/	3186	*/
3181	public static final String CODEASSIST_EXCLUDED_CATEGORIES= "content_assist_disabled_computers"; //$NON-NLS-1$	3187	public static final String CODEASSIST_EXCLUDED_CATEGORIES= "content_assist_disabled_computers"; //$NON-NLS-1$
3182		3188
Lines 3196-3203 Link Here
3196	* </p>	3202	* </p>
3197	*	3203	*
3198	* @since 3.2	3204	* @since 3.2
		3205	* @deprecated As of 3.8, use {@link #CODEASSIST_PROPOSAL_LISTS} instead
3199	*/	3206	*/
3200	public static final String CODEASSIST_CATEGORY_ORDER= "content_assist_category_order"; //$NON-NLS-1$	3207	public static final String CODEASSIST_CATEGORY_ORDER= "content_assist_category_order"; //$NON-NLS-1$
		3208
		3209	/**
		3210	* A named preference that controls which completion proposal category is included in which proposal list.
		3211	* <p>
		3212	* Value is of type <code>String</code>, a "\0"-separated list of "\1"-separated lists with categoryId where
		3213	* <ul>
		3214	* <li>categoryId is the <code>String</code> holding the category ID</li>
		3215	* </ul>
		3216	*
		3217	* </p>
		3218	*
		3219	* @see #getProposalLists()
		3220	* @see #setProposalLists(Map)
		3221	* @since 3.8
		3222	*/
		3223	public static final String CODEASSIST_PROPOSAL_LISTS= "content_assist_proposal_lists"; //$NON-NLS-1$
3201		3224
3202	/**	3225	/**
3203	* A named preference that controls whether folding is enabled in the Java editor.	3226	* A named preference that controls whether folding is enabled in the Java editor.
Lines 3784-3791 Link Here
3784	store.setDefault(PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES, true);	3807	store.setDefault(PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES, true);
3785	store.setDefault(PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS, false);	3808	store.setDefault(PreferenceConstants.CODEASSIST_GUESS_METHOD_ARGUMENTS, false);
3786	store.setDefault(PreferenceConstants.CODEASSIST_PREFIX_COMPLETION, false);	3809	store.setDefault(PreferenceConstants.CODEASSIST_PREFIX_COMPLETION, false);
3787	store.setDefault(PreferenceConstants.CODEASSIST_EXCLUDED_CATEGORIES, "org.eclipse.jdt.ui.textProposalCategory\0org.eclipse.jdt.ui.javaTypeProposalCategory\0org.eclipse.jdt.ui.javaNoTypeProposalCategory\0"); //$NON-NLS-1$	3810	store.setDefault(PreferenceConstants.CODEASSIST_PROPOSAL_LISTS, "org.eclipse.jdt.ui.templateProposalCategory:org.eclipse.jdt.ui.swtProposalCategory:org.eclipse.jdt.ui.javaAllProposalCategory:org.eclipse.pde.api.tools.ui.apitools_proposal_category:\0org.eclipse.jdt.ui.templateProposalCategory:\0org.eclipse.jdt.ui.swtProposalCategory:\0org.eclipse.pde.api.tools.ui.apitools_proposal_category:\0"); //$NON-NLS-1$
3788	store.setDefault(PreferenceConstants.CODEASSIST_CATEGORY_ORDER, "org.eclipse.jdt.ui.spellingProposalCategory:65545\0org.eclipse.jdt.ui.javaTypeProposalCategory:65540\0org.eclipse.jdt.ui.javaNoTypeProposalCategory:65539\0org.eclipse.jdt.ui.textProposalCategory:65541\0org.eclipse.jdt.ui.javaAllProposalCategory:65542\0org.eclipse.jdt.ui.templateProposalCategory:2\0org.eclipse.jdt.ui.swtProposalCategory:3\0"); //$NON-NLS-1$
3789	store.setDefault(PreferenceConstants.CODEASSIST_LRU_HISTORY, ""); //$NON-NLS-1$	3811	store.setDefault(PreferenceConstants.CODEASSIST_LRU_HISTORY, ""); //$NON-NLS-1$
3790	store.setDefault(PreferenceConstants.CODEASSIST_SORTER, "org.eclipse.jdt.ui.RelevanceSorter"); //$NON-NLS-1$	3812	store.setDefault(PreferenceConstants.CODEASSIST_SORTER, "org.eclipse.jdt.ui.RelevanceSorter"); //$NON-NLS-1$
3791	store.setDefault(PreferenceConstants.CODEASSIST_FAVORITE_STATIC_MEMBERS, ""); //$NON-NLS-1$	3813	store.setDefault(PreferenceConstants.CODEASSIST_FAVORITE_STATIC_MEMBERS, ""); //$NON-NLS-1$
Lines 4005-4042 Link Here
4005	}	4027	}
4006		4028
4007	/**	4029	/**
4008	* Returns the completion proposal categories which	4030	* Returns the completion proposal categories with their corresponding proposal list indices.
4009	* are excluded from the default proposal list.	4031	*
4010	*	4032	* @return a map which maps the category IDs to a set of proposal list indices
4011	* @return an array with the IDs of the excluded categories	4033	* @see #CODEASSIST_PROPOSAL_LISTS
4012	* @see #CODEASSIST_EXCLUDED_CATEGORIES	4034	* @since 3.8
4013	* @since 3.4	4035	*/
4014	*/	4036	public static Map<String, Set<Integer>> getProposalLists() {
4015	public static String[] getExcludedCompletionProposalCategories() {	4037	String encodedPreference= getPreference(CODEASSIST_PROPOSAL_LISTS, null);
4016	String encodedPreference= getPreference(CODEASSIST_EXCLUDED_CATEGORIES, null);	4038	Map<String, Set<Integer>> result= new HashMap<String, Set<Integer>>();
4017	StringTokenizer tokenizer= new StringTokenizer(encodedPreference, "\0"); //$NON-NLS-1$	4039	StringTokenizer tok= new StringTokenizer(encodedPreference, "\0"); //$NON-NLS-1$
4018	String[] result= new String[tokenizer.countTokens()];	4040	for (int i= 0; tok.hasMoreTokens(); i++) {
4019	for (int i= 0; i < result.length; i++)	4041	StringTokenizer inner= new StringTokenizer(tok.nextToken(), ":"); //$NON-NLS-1$
4020	result[i]= tokenizer.nextToken();	4042	if (inner.countTokens() == 0)
		4043	i--;
		4044	while (inner.hasMoreTokens()) {
		4045	String category= inner.nextToken();
		4046	Set<Integer> set= result.get(category);
		4047	if (set == null) {
		4048	set= new HashSet<Integer>();
		4049	result.put(category, set);
		4050	}
		4051	set.add(Integer.valueOf(i));
		4052	}
		4053	}
4021	return result;	4054	return result;
4022	}	4055	}
4023		4056
4024	/**	4057	/**
4025	* Sets the completion proposal categories which are excluded from the	4058	* Sets the completion proposal categories for each proposal list and reloads the registry.
4026	* default proposal list and reloads the registry.	4059	*
4027	*	4060	* @param proposalLists a map which maps the category IDs to a set of proposal list indices
4028	* @param categories the array with the IDs of the excluded categories	4061	* @see #CODEASSIST_PROPOSAL_LISTS
4029	* @see #CODEASSIST_EXCLUDED_CATEGORIES	4062	* @since 3.8
4030	* @since 3.4	4063	*/
4031	*/	4064	public static void setProposalLists(Map<String, Set<Integer>> proposalLists) {
4032	public static void setExcludedCompletionProposalCategories(String[] categories) {	4065	Assert.isLegal(proposalLists != null);
4033	Assert.isLegal(categories != null);	4066	int initialBufferSize= 250;
4034	StringBuffer buf= new StringBuffer(50 * categories.length);	4067	Map<Integer, StringBuffer> proposalListsCategories= new TreeMap<Integer, StringBuffer>();
4035	for (int i= 0; i < categories.length; i++) {	4068	for (Entry<String, Set<Integer>> category : proposalLists.entrySet()) {
4036	buf.append(categories[i]);	4069	for (Integer index : category.getValue()) {
4037	buf.append('\0');	4070	StringBuffer buf= proposalListsCategories.get(index);
		4071	if (buf == null) {
		4072	buf= new StringBuffer(initialBufferSize);
		4073	proposalListsCategories.put(index, buf);
		4074	}
		4075	buf.append(category.getKey());
		4076	buf.append(":"); //$NON-NLS-1$
		4077	}
		4078	}
		4079	StringBuffer buf= new StringBuffer(initialBufferSize * proposalListsCategories.size());
		4080	for (StringBuffer proposalList : proposalListsCategories.values()) {
		4081	buf.append(proposalList);
		4082	buf.append("\0"); //$NON-NLS-1$
4038	}	4083	}
4039	getPreferenceStore().setValue(CODEASSIST_EXCLUDED_CATEGORIES, buf.toString());	4084	getPreferenceStore().setValue(CODEASSIST_PROPOSAL_LISTS, buf.toString());
4040	CompletionProposalComputerRegistry.getDefault().reload();	4085	CompletionProposalComputerRegistry.getDefault().reload();
4041	}	4086	}
4042		4087

Lines 7-17 Link Here

(-)ui/org/eclipse/jdt/internal/ui/javaeditor/SpecificContentAssistExecutor.java (-16 / +18 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.jdt.internal.ui.javaeditor;	12	package org.eclipse.jdt.internal.ui.javaeditor;
12		13
		14	import java.util.ArrayList;
13	import java.util.Collection;	15	import java.util.Collection;
		16	import java.util.HashSet;
14	import java.util.Iterator;	17	import java.util.Iterator;
		18	import java.util.Set;
15		19
16	import org.eclipse.core.runtime.Assert;	20	import org.eclipse.core.runtime.Assert;
17		21
Lines 24-31 Link Here
24	import org.eclipse.jdt.internal.ui.text.java.CompletionProposalComputerRegistry;	28	import org.eclipse.jdt.internal.ui.text.java.CompletionProposalComputerRegistry;
25		29
26	/**	30	/**
27	* A content assist executor can invoke content assist for a specific proposal category on an editor.	31	* A content assist executor can invoke content assist for a specific proposal category on an
28	*	32	* editor.
		33	*
29	* @since 3.2	34	* @since 3.2
30	*/	35	*/
31	public final class SpecificContentAssistExecutor {	36	public final class SpecificContentAssistExecutor {
Lines 34-40 Link Here
34		39
35	/**	40	/**
36	* Creates a new executor.	41	* Creates a new executor.
37	*	42	*
38	* @param registry the computer registry to use for the enablement of proposal categories	43	* @param registry the computer registry to use for the enablement of proposal categories
39	*/	44	*/
40	public SpecificContentAssistExecutor(CompletionProposalComputerRegistry registry) {	45	public SpecificContentAssistExecutor(CompletionProposalComputerRegistry registry) {
Lines 45-65 Link Here
45	/**	50	/**
46	* Invokes content assist on <code>editor</code>, showing only proposals computed by the	51	* Invokes content assist on <code>editor</code>, showing only proposals computed by the
47	* <code>CompletionProposalCategory</code> with the given <code>categoryId</code>.	52	* <code>CompletionProposalCategory</code> with the given <code>categoryId</code>.
48	*	53	*
49	* @param editor the editor to invoke code assist on	54	* @param editor the editor to invoke code assist on
50	* @param categoryId the id of the proposal category to show proposals for	55	* @param categoryId the id of the proposal category to show proposals for
51	*/	56	*/
52	public void invokeContentAssist(final ITextEditor editor, String categoryId) {	57	public void invokeContentAssist(final ITextEditor editor, String categoryId) {
53	Collection<CompletionProposalCategory> categories= fRegistry.getProposalCategories();	58	Collection<CompletionProposalCategory> categories= fRegistry.getProposalCategories();
54	boolean[] inclusionState= new boolean[categories.size()];	59	ArrayList<Set<Integer>> categoriesState= new ArrayList<Set<Integer>>(categories.size());
55	boolean[] separateState= new boolean[categories.size()];	60	for (CompletionProposalCategory cat : categories) {
56	int i= 0;	61	categoriesState.add(new HashSet<Integer>(cat.getProposalListIndices()));
57	for (Iterator<CompletionProposalCategory> it= categories.iterator(); it.hasNext(); i++) {	62	cat.clearProposalListIndices();
58	CompletionProposalCategory cat= it.next();	63	if (cat.getId().equals(categoryId))
59	inclusionState[i]= cat.isIncluded();	64	cat.addProposalListIndex(Integer.valueOf(0));
60	cat.setIncluded(cat.getId().equals(categoryId));
61	separateState[i]= cat.isSeparateCommand();
62	cat.setSeparateCommand(false);
63	}	65	}
64		66
65	try {	67	try {
Lines 67-77 Link Here
67	if (target != null && target.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS))	69	if (target != null && target.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS))
68	target.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);	70	target.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
69	} finally {	71	} finally {
70	i= 0;	72	int i= 0;
71	for (Iterator<CompletionProposalCategory> it= categories.iterator(); it.hasNext(); i++) {	73	for (Iterator<CompletionProposalCategory> it= categories.iterator(); it.hasNext(); i++) {
72	CompletionProposalCategory cat= it.next();	74	CompletionProposalCategory cat= it.next();
73	cat.setIncluded(inclusionState[i]);	75	cat.clearProposalListIndices();
74	cat.setSeparateCommand(separateState[i]);	76	cat.addAllProposalListIndices(categoriesState.get(i));
75	}	77	}
76	}	78	}
77	}	79	}

Lines 11-16 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java (-7 / +5 lines)
11	* Sebastian Davids, sdavids@gmx.de - 187316 [preferences] Mark Occurences Pref Page; Link to	11	* Sebastian Davids, sdavids@gmx.de - 187316 [preferences] Mark Occurences Pref Page; Link to
12	* Benjamin Muskalla <b.muskalla@gmx.net> - [preferences] Add preference for new compiler warning: MissingSynchronizedModifierInInheritedMethod - https://bugs.eclipse.org/bugs/show_bug.cgi?id=245240	12	* Benjamin Muskalla <b.muskalla@gmx.net> - [preferences] Add preference for new compiler warning: MissingSynchronizedModifierInInheritedMethod - https://bugs.eclipse.org/bugs/show_bug.cgi?id=245240
13	* Guven Demir <guven.internet+eclipse@gmail.com> - [package explorer] Alternative package name shortening: abbreviation - https://bugs.eclipse.org/bugs/show_bug.cgi?id=299514	13	* Guven Demir <guven.internet+eclipse@gmail.com> - [package explorer] Alternative package name shortening: abbreviation - https://bugs.eclipse.org/bugs/show_bug.cgi?id=299514
		14	* Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
14	*******************************************************************************/	15	*******************************************************************************/
15	package org.eclipse.jdt.internal.ui.preferences;	16	package org.eclipse.jdt.internal.ui.preferences;
16		17
Lines 41-56 Link Here
41	public static String ClasspathVariablesPreferencePage_savechanges_message;	42	public static String ClasspathVariablesPreferencePage_savechanges_message;
42	public static String CleanUpPreferencePage_Description;	43	public static String CleanUpPreferencePage_Description;
43	public static String CleanUpPreferencePage_Title;	44	public static String CleanUpPreferencePage_Title;
44	public static String CodeAssistAdvancedConfigurationBlock_default_table_category_column_title;	45	public static String CodeAssistAdvancedConfigurationBlock_provided_table_category_column_title;
45	public static String CodeAssistAdvancedConfigurationBlock_default_table_description;	46	public static String CodeAssistAdvancedConfigurationBlock_provided_table_description;
46	public static String CodeAssistAdvancedConfigurationBlock_default_table_keybinding_column_title;	47	public static String CodeAssistAdvancedConfigurationBlock_provided_table_keybinding_column_title;
47	public static String CodeAssistAdvancedConfigurationBlock_key_binding_hint;	48	public static String CodeAssistAdvancedConfigurationBlock_key_binding_hint;
		49	public static String CodeAssistAdvancedConfigurationBlock_proposal_list_table_title;
48	public static String CodeAssistAdvancedConfigurationBlock_page_description;	50	public static String CodeAssistAdvancedConfigurationBlock_page_description;
49	public static String CodeAssistAdvancedConfigurationBlock_separate_table_category_column_title;
50	public static String CodeAssistAdvancedConfigurationBlock_separate_table_description;
51	public static String CodeAssistAdvancedConfigurationBlock_no_shortcut;	51	public static String CodeAssistAdvancedConfigurationBlock_no_shortcut;
52	public static String CodeAssistAdvancedConfigurationBlock_Up;
53	public static String CodeAssistAdvancedConfigurationBlock_Down;
54	public static String CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout;	52	public static String CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout;
55	public static String CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_emptyInput;	53	public static String CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_emptyInput;
56	public static String CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidInput;	54	public static String CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidInput;

Lines 11-16 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties (-7 / +5 lines)
11	# Sebastian Davids, sdavids@gmx.de - 187316 [preferences] Mark Occurrences Pref Page; Link to	11	# Sebastian Davids, sdavids@gmx.de - 187316 [preferences] Mark Occurrences Pref Page; Link to
12	# Benjamin Muskalla <b.muskalla@gmx.net> - [preferences] Add preference for new compiler warning: MissingSynchronizedModifierInInheritedMethod - https://bugs.eclipse.org/bugs/show_bug.cgi?id=245240	12	# Benjamin Muskalla <b.muskalla@gmx.net> - [preferences] Add preference for new compiler warning: MissingSynchronizedModifierInInheritedMethod - https://bugs.eclipse.org/bugs/show_bug.cgi?id=245240
13	# Guven Demir <guven.internet+eclipse@gmail.com> - [package explorer] Alternative package name shortening: abbreviation - https://bugs.eclipse.org/bugs/show_bug.cgi?id=299514	13	# Guven Demir <guven.internet+eclipse@gmail.com> - [package explorer] Alternative package name shortening: abbreviation - https://bugs.eclipse.org/bugs/show_bug.cgi?id=299514
		14	# Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
14	###############################################################################	15	###############################################################################
15		16
16	BuildPathsPropertyPage_error_message=An error occurred while setting the build path.	17	BuildPathsPropertyPage_error_message=An error occurred while setting the build path.
Lines 848-862 Link Here
848	CodeAssistAdvancedConfigurationBlock_page_description=Configure the behavior of the content assist ({0}) command.	849	CodeAssistAdvancedConfigurationBlock_page_description=Configure the behavior of the content assist ({0}) command.
849	# stand-in text if there is no keyboard shortcut in above statement	850	# stand-in text if there is no keyboard shortcut in above statement
850	CodeAssistAdvancedConfigurationBlock_no_shortcut=no shortcut	851	CodeAssistAdvancedConfigurationBlock_no_shortcut=no shortcut
851	CodeAssistAdvancedConfigurationBlock_default_table_description=&Select the proposal kinds contained in the 'default' content assist list:	852	CodeAssistAdvancedConfigurationBlock_provided_table_description=Drag proposal kinds to lists on the right to configure which proposals you want to have on each position while repeatedly invoking content assist.
852	CodeAssistAdvancedConfigurationBlock_default_table_category_column_title=Default Proposal Kinds	853	CodeAssistAdvancedConfigurationBlock_provided_table_category_column_title=Proposal Kinds
853	CodeAssistAdvancedConfigurationBlock_default_table_keybinding_column_title=Key Binding	854	CodeAssistAdvancedConfigurationBlock_provided_table_keybinding_column_title=Key Binding
854	# do not translate the href argument (org.eclipse.ui.preferencePages.Keys)	855	# do not translate the href argument (org.eclipse.ui.preferencePages.Keys)
855	CodeAssistAdvancedConfigurationBlock_key_binding_hint=Individual key bindings can be assigned to each proposal kind on the <a href="org.eclipse.ui.preferencePages.Keys">'Keys'</a> preference page.	856	CodeAssistAdvancedConfigurationBlock_key_binding_hint=Individual key bindings can be assigned to each proposal kind on the <a href="org.eclipse.ui.preferencePages.Keys">'Keys'</a> preference page.
856	CodeAssistAdvancedConfigurationBlock_separate_table_description=&Content assist cycling: Select the proposal kinds that are cycled through when repeatedly invoking content assist:	857	CodeAssistAdvancedConfigurationBlock_proposal_list_table_title={0}. Proposal List
857	CodeAssistAdvancedConfigurationBlock_separate_table_category_column_title=Separate Proposal Kinds
858	CodeAssistAdvancedConfigurationBlock_Up=&Up
859	CodeAssistAdvancedConfigurationBlock_Down=D&own
860	CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout=&Timeout for fetching a parameter name from attached Javadoc (ms):	858	CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout=&Timeout for fetching a parameter name from attached Javadoc (ms):
861		859
862	CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_emptyInput=Empty input.	860	CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_emptyInput=Empty input.

Added Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/codeassist/advanced/CodeAssistAdvancedConfigurationBlock.java (+459 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
11	*******************************************************************************/
12	package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced;
13
14	import java.util.HashMap;
15	import java.util.Iterator;
16	import java.util.Map;
17
18	import org.eclipse.swt.SWT;
19	import org.eclipse.swt.dnd.Transfer;
20	import org.eclipse.swt.events.SelectionAdapter;
21	import org.eclipse.swt.events.SelectionEvent;
22	import org.eclipse.swt.graphics.GC;
23	import org.eclipse.swt.graphics.Image;
24	import org.eclipse.swt.layout.GridData;
25	import org.eclipse.swt.layout.GridLayout;
26	import org.eclipse.swt.widgets.Composite;
27	import org.eclipse.swt.widgets.Control;
28	import org.eclipse.swt.widgets.Label;
29	import org.eclipse.swt.widgets.Link;
30	import org.eclipse.swt.widgets.Table;
31	import org.eclipse.swt.widgets.TableColumn;
32
33	import org.eclipse.core.commands.Command;
34	import org.eclipse.core.commands.CommandManager;
35	import org.eclipse.core.commands.ParameterizedCommand;
36	import org.eclipse.core.commands.common.NotDefinedException;
37	import org.eclipse.core.commands.contexts.ContextManager;
38
39	import org.eclipse.core.runtime.Assert;
40
41	import org.eclipse.jface.bindings.BindingManager;
42	import org.eclipse.jface.bindings.Scheme;
43	import org.eclipse.jface.bindings.TriggerSequence;
44	import org.eclipse.jface.layout.PixelConverter;
45	import org.eclipse.jface.resource.ImageDescriptor;
46	import org.eclipse.jface.resource.JFaceResources;
47	import org.eclipse.jface.viewers.ArrayContentProvider;
48	import org.eclipse.jface.viewers.ITableLabelProvider;
49	import org.eclipse.jface.viewers.LabelProvider;
50	import org.eclipse.jface.viewers.TableViewer;
51
52	import org.eclipse.ui.PlatformUI;
53	import org.eclipse.ui.commands.ICommandService;
54	import org.eclipse.ui.dialogs.PreferencesUtil;
55	import org.eclipse.ui.keys.IBindingService;
56	import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
57
58	import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
59
60	import org.eclipse.jdt.core.JavaCore;
61
62	import org.eclipse.jdt.internal.corext.util.Messages;
63
64	import org.eclipse.jdt.ui.PreferenceConstants;
65
66	import org.eclipse.jdt.internal.ui.JavaPlugin;
67	import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
68	import org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock;
69	import org.eclipse.jdt.internal.ui.preferences.PreferencesMessages;
70	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.DragProvidedCategoryListener;
71	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.DropIntoProvidedListener;
72	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListCategoryTransfer;
73	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListTransfer;
74	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalTransfer;
75	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProvidedCategoryTransfer;
76	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.ModelElement;
77	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.model.PreferenceModel;
78	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.widgets.ProposalListSection;
79	import org.eclipse.jdt.internal.ui.text.java.CompletionProposalComputerRegistry;
80	import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
81
82
83	/**
84	*
85	* @since 3.2
86	*/
87	public final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlock {
88
89	protected static final Key PREF_PROPOSAL_LISTS= getJDTUIKey(PreferenceConstants.CODEASSIST_PROPOSAL_LISTS);
90
91	private static final Key PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC= getJDTCoreKey(JavaCore.TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC);
92
93	private static Key[] getAllKeys() {
94	return new Key[] {
95	PREF_PROPOSAL_LISTS,
96	PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC
97	};
98	}
99
100	private static final int NUMBER_OF_PAGE_COLUMNS= 2;
101
102	private final class ProvidedTableLabelProvider extends LabelProvider implements ITableLabelProvider {
103
104	/*
105	* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
106	*/
107	public Image getColumnImage(Object element, int columnIndex) {
108	if (columnIndex == 0)
109	return ((ModelElement) element).getImage();
110	return null;
111	}
112
113	/*
114	* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
115	*/
116	public String getColumnText(Object element, int columnIndex) {
117	switch (columnIndex) {
118	case 0:
119	return ((ModelElement) element).getName();
120	case 1:
121	return ((ModelElement) element).getKeybindingAsString();
122	default:
123	Assert.isTrue(false);
124	return null;
125	}
126	}
127	}
128
129	private final PreferenceModel fModel;
130
131	private final Map<ImageDescriptor, Image> fImages= new HashMap<ImageDescriptor, Image>();
132
133	private TableViewer fProvidedViewer;
134
135	private ProposalListSection fProposalListSection;
136
137	private final CodeAssistAdvancedUtilitiesProxy fUtilitiesProxy;
138
139	public CodeAssistAdvancedConfigurationBlock(IStatusChangeListener statusListener, IWorkbenchPreferenceContainer container) {
140	super(statusListener, null, getAllKeys(), container);
141	fUtilitiesProxy= new CodeAssistAdvancedUtilitiesProxy(this);
142	fModel= new PreferenceModel(CompletionProposalComputerRegistry.getDefault(), fUtilitiesProxy);
143	}
144
145	/*
146	* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#createContents(org.eclipse.swt.widgets.Composite)
147	*/
148	@Override
149	public Control createContents(Composite parent) {
150	Composite composite= createWrappingComposite(parent);
151
152	createPageDescription(composite);
153
154	createProvidedSection(composite);
155	fProposalListSection= new ProposalListSection(composite, fModel, fUtilitiesProxy);
156
157	createFiller(composite);
158
159	createParameterTimeoutControl(composite);
160
161	updateControls();
162	selectFirstProvidedCategory();
163
164	return composite;
165	}
166
167	private Composite createWrappingComposite(Composite parent) {
168	Composite composite= new Composite(parent, SWT.NONE);
169	GridLayout layout= new GridLayout(NUMBER_OF_PAGE_COLUMNS, false);
170	layout.marginWidth= 0;
171	layout.marginHeight= 0;
172	composite.setLayout(layout);
173	return composite;
174	}
175
176	private void createPageDescription(Composite composite) {
177	final ICommandService commandSvc= (ICommandService) PlatformUI.getWorkbench().getAdapter(ICommandService.class);
178	final Command command= commandSvc.getCommand(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
179	ParameterizedCommand pCmd= new ParameterizedCommand(command, null);
180	String key= getKeyboardShortcut(pCmd);
181	if (key == null)
182	key= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_no_shortcut;
183
184	PixelConverter pixelConverter= new PixelConverter(composite);
185	int width= pixelConverter.convertWidthInCharsToPixels(40);
186
187	Label label= new Label(composite, SWT.NONE \| SWT.WRAP);
188	label.setText(Messages.format(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_page_description, new Object[] { key }));
189	GridData gd= new GridData(GridData.FILL, GridData.FILL, true, false, NUMBER_OF_PAGE_COLUMNS, 1);
190	gd.widthHint= width;
191	label.setLayoutData(gd);
192	}
193
194	private void createProvidedSection(Composite composite) {
195	Composite providedContainer= new Composite(composite, SWT.NONE);
196	GridLayout layout= new GridLayout();
197	layout.marginWidth= 0;
198	layout.marginHeight= 0;
199	providedContainer.setLayout(layout);
200	providedContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
201
202	createProvidedViewer(providedContainer);
203	createProvidedLabel(providedContainer);
204	createKeysLink(providedContainer);
205	}
206
207	private void createProvidedViewer(Composite composite) {
208	fProvidedViewer= new TableViewer(composite, SWT.SINGLE \| SWT.BORDER \| SWT.V_SCROLL);
209	Table table= fProvidedViewer.getTable();
210	table.setHeaderVisible(true);
211	table.setLinesVisible(false);
212	GridData gridData= new GridData(SWT.FILL, SWT.FILL, true, true);
213	gridData.heightHint= 0;
214	table.setLayoutData(gridData);
215
216	TableColumn nameColumn= new TableColumn(table, SWT.NONE);
217	nameColumn.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_provided_table_category_column_title);
218	nameColumn.setResizable(false);
219	TableColumn keyColumn= new TableColumn(table, SWT.NONE);
220	keyColumn.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_provided_table_keybinding_column_title);
221	keyColumn.setResizable(false);
222
223	fProvidedViewer.setContentProvider(new ArrayContentProvider());
224	ProvidedTableLabelProvider labelProvider= new ProvidedTableLabelProvider();
225	fProvidedViewer.setLabelProvider(labelProvider);
226	fProvidedViewer.setInput(fModel.elements);
227	fProvidedViewer.setComparator(new ModelElement.ModelElementViewerComparator()); // sort alphabetically
228
229	final int ICON_WIDTH= 16;
230	final int HEADER_MARGIN= 20;
231	int minNameWidth= computeWidth(table, nameColumn.getText()) + HEADER_MARGIN;
232	int minKeyWidth= computeWidth(table, keyColumn.getText()) + HEADER_MARGIN;
233	for (int i= 0; i < fModel.elements.size(); i++) {
234	minNameWidth= Math.max(minNameWidth, computeWidth(table, labelProvider.getColumnText(fModel.elements.get(i), 0)) + ICON_WIDTH);
235	minKeyWidth= Math.max(minKeyWidth, computeWidth(table, labelProvider.getColumnText(fModel.elements.get(i), 1)));
236	}
237	nameColumn.setWidth(minNameWidth);
238	keyColumn.setWidth(minKeyWidth);
239
240	// add drag support for provided categories
241	Transfer[] transferTypes= new Transfer[] { ProvidedCategoryTransfer.getInstance() };
242	fProvidedViewer.addDragSupport(ProposalTransfer.ALL_DRAG_OPERATIONS, transferTypes, new DragProvidedCategoryListener(fProvidedViewer));
243
244	// add drop support for proposal lists and proposal list categories
245	transferTypes= new Transfer[] { ProposalListTransfer.getInstance(), ProposalListCategoryTransfer.getInstance() };
246	fProvidedViewer.addDropSupport(ProposalTransfer.ALL_DRAG_OPERATIONS, transferTypes, new DropIntoProvidedListener(fProvidedViewer, fModel, fUtilitiesProxy));
247	}
248
249	private void createProvidedLabel(Composite composite) {
250	PixelConverter pixelConverter= new PixelConverter(composite);
251	int width= pixelConverter.convertWidthInCharsToPixels(40);
252
253	Label label= new Label(composite, SWT.NONE \| SWT.WRAP);
254	label.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_provided_table_description);
255	GridData gd= new GridData(GridData.FILL, GridData.FILL, true, false);
256	gd.widthHint= width;
257	label.setLayoutData(gd);
258	}
259
260	private void createKeysLink(Composite composite) {
261	Link link= new Link(composite, SWT.NONE \| SWT.WRAP);
262	link.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_key_binding_hint);
263	link.addSelectionListener(new SelectionAdapter() {
264	@Override
265	public void widgetSelected(SelectionEvent e) {
266	PreferencesUtil.createPreferenceDialogOn(getShell(), e.text, null, null);
267	}
268	});
269
270	PixelConverter pixelConverter= new PixelConverter(composite);
271	int width= pixelConverter.convertWidthInCharsToPixels(40);
272
273	// limit the size of the Link as it would take all it can get
274	GridData gd= new GridData(GridData.FILL, GridData.FILL, false, false);
275	gd.widthHint= width;
276	link.setLayoutData(gd);
277	}
278
279	private void createFiller(Composite composite) {
280	Label filler= new Label(composite, SWT.NONE);
281	filler.setVisible(false);
282	filler.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, NUMBER_OF_PAGE_COLUMNS, 1));
283	}
284
285	private void createParameterTimeoutControl(Composite composite) {
286	Composite timeoutComposite= new Composite(composite, SWT.NONE);
287	GridLayout layout= new GridLayout(4, false);
288	layout.marginWidth= 0;
289	layout.marginHeight= 0;
290	timeoutComposite.setLayout(layout);
291	GridData gd= new GridData(GridData.FILL, GridData.FILL, true, false, NUMBER_OF_PAGE_COLUMNS, 1);
292	timeoutComposite.setLayoutData(gd);
293
294	PixelConverter pixelConverter= new PixelConverter(composite);
295	String str= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout;
296	addTextField(timeoutComposite, str, PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC, 0, pixelConverter.convertWidthInCharsToPixels(7));
297	}
298
299	private void selectFirstProvidedCategory() {
300	if (fModel.elements.size() > 0) {
301	fProvidedViewer.getTable().select(0);
302	}
303	}
304
305	/*
306	* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#settingsUpdated()
307	*/
308	@Override
309	protected void settingsUpdated() {
310	if (fModel != null)
311	fModel.updatePreferenceModel();
312	}
313
314	/*
315	* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#updateControls()
316	*/
317	@Override
318	protected void updateControls() {
319	super.updateControls();
320	fProvidedViewer.refresh();
321	fProposalListSection.updateControls();
322	}
323
324	/*
325	* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#processChanges(org.eclipse.ui.preferences.IWorkbenchPreferenceContainer)
326	*/
327	@Override
328	protected boolean processChanges(IWorkbenchPreferenceContainer container) {
329	fModel.updatePreferenceModel();
330	return super.processChanges(container);
331	}
332
333	/*
334	* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#setValue(Key, String)
335	*/
336	@Override
337	protected String setValue(Key key, String value) {
338	return super.setValue(key, value);
339	}
340
341	/*
342	* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#getValue(Key)
343	*/
344	@Override
345	protected String getValue(Key key) {
346	return super.getValue(key);
347	}
348
349	/*
350	* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#validateSettings(org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock.Key, java.lang.String, java.lang.String)
351	*/
352	@Override
353	protected void validateSettings(Key changedKey, String oldValue, String newValue) {
354	if (changedKey == PREF_CODEASSIST_TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC) {
355	final StatusInfo status= new StatusInfo();
356	if (newValue.length() == 0)
357	status.setError(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_emptyInput);
358	else {
359	try {
360	int number= Integer.parseInt(newValue);
361	int min= 0;
362	int max= 5000;
363	if (number < min \|\| number > max) {
364	String msgFormat= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidRange;
365	String msg= Messages.format(msgFormat, new Object[] { new Integer(min), new Integer(max) });
366	status.setError(msg);
367	}
368	} catch (NumberFormatException ex) {
369	String msgFormat= PreferencesMessages.CodeAssistAdvancedConfigurationBlock_parameterNameFromAttachedJavadoc_timeout_invalidInput;
370	String msg= Messages.format(msgFormat, newValue);
371	status.setError(msg);
372	}
373	}
374	fContext.statusChanged(status);
375	}
376	}
377
378	/*
379	* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#getFullBuildDialogStrings(boolean)
380	*/
381	@Override
382	protected String[] getFullBuildDialogStrings(boolean workspaceSettings) {
383	// no builds triggered by our settings
384	return null;
385	}
386
387	/*
388	* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#dispose()
389	*/
390	@Override
391	public void dispose() {
392	for (Iterator<Image> it= fImages.values().iterator(); it.hasNext();) {
393	Image image= it.next();
394	image.dispose();
395	}
396	super.dispose();
397	}
398
399	protected int computeWidth(Control control, String name) {
400	if (name == null)
401	return 0;
402	GC gc= new GC(control);
403	try {
404	gc.setFont(JFaceResources.getDialogFont());
405	return gc.stringExtent(name).x + 10;
406	} finally {
407	gc.dispose();
408	}
409	}
410
411	protected Image getImage(ImageDescriptor imgDesc) {
412	if (imgDesc == null)
413	return null;
414
415	Image img= fImages.get(imgDesc);
416	if (img == null) {
417	img= imgDesc.createImage(false);
418	fImages.put(imgDesc, img);
419	}
420	return img;
421	}
422
423	private static BindingManager fgLocalBindingManager;
424	static {
425	fgLocalBindingManager= new BindingManager(new ContextManager(), new CommandManager());
426	final IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
427	final Scheme[] definedSchemes= bindingService.getDefinedSchemes();
428	if (definedSchemes != null) {
429	try {
430	for (int i= 0; i < definedSchemes.length; i++) {
431	final Scheme scheme= definedSchemes[i];
432	final Scheme copy= fgLocalBindingManager.getScheme(scheme.getId());
433	copy.define(scheme.getName(), scheme.getDescription(), scheme.getParentId());
434	}
435	} catch (final NotDefinedException e) {
436	JavaPlugin.log(e);
437	}
438	}
439	fgLocalBindingManager.setLocale(bindingService.getLocale());
440	fgLocalBindingManager.setPlatform(bindingService.getPlatform());
441	}
442
443	protected static String getKeyboardShortcut(ParameterizedCommand command) {
444	IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
445	fgLocalBindingManager.setBindings(bindingService.getBindings());
446	try {
447	Scheme activeScheme= bindingService.getActiveScheme();
448	if (activeScheme != null)
449	fgLocalBindingManager.setActiveScheme(activeScheme);
450	} catch (NotDefinedException e) {
451	JavaPlugin.log(e);
452	}
453
454	TriggerSequence[] bindings= fgLocalBindingManager.getActiveBindingsDisregardingContextFor(command);
455	if (bindings.length > 0)
456	return bindings[0].format();
457	return null;
458	}
459	}

Added Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/codeassist/advanced/CodeAssistAdvancedUtilitiesProxy.java (+103 lines)
1	/**
2	* Copyright (c) 2011 Thomas Schlosser.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - initial API and implementation.
10	*/
11	package org.eclipse.jdt.internal.ui.preferences.codeassist.advanced;
12
13	import org.eclipse.swt.SWT;
14	import org.eclipse.swt.dnd.DND;
15	import org.eclipse.swt.dnd.TransferData;
16	import org.eclipse.swt.graphics.Color;
17	import org.eclipse.swt.graphics.Image;
18	import org.eclipse.swt.widgets.Control;
19	import org.eclipse.swt.widgets.Display;
20
21	import org.eclipse.core.commands.ParameterizedCommand;
22
23	import org.eclipse.jface.resource.ImageDescriptor;
24
25	import org.eclipse.ui.plugin.AbstractUIPlugin;
26
27	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListCategoryTransfer;
28	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProposalListTransfer;
29	import org.eclipse.jdt.internal.ui.preferences.codeassist.advanced.dnd.ProvidedCategoryTransfer;
30
31	/**
32	*
33	* @since 3.8
34	*/
35	public class CodeAssistAdvancedUtilitiesProxy {
36	public static final Color SELECTED_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION);
37
38	public static final Color SELECTED_TEXT_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT);
39
40	public static final Color UNSELECTED_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
41
42	public static final Color UNSELECTED_TEXT_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);
43
44	public static final Color UNSELECTED_BORDER_COLOR= Display.getCurrent().getSystemColor(SWT.COLOR_GRAY);
45
46	private static final ImageDescriptor REMOVE_PROPOSAL_LIST_ICON_DESCRIPTOR= AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.jdt.ui", "$nl$/icons/full/elcl16/remove_proposal_list.gif"); //$NON-NLS-1$ //$NON-NLS-2$
47
48	private static final ImageDescriptor REMOVE_PROPOSAL_LIST_OVER_ICON_DESCRIPTOR= AbstractUIPlugin.imageDescriptorFromPlugin(
49	"org.eclipse.jdt.ui", "$nl$/icons/full/elcl16/remove_proposal_list_over.gif"); //$NON-NLS-1$ //$NON-NLS-2$
50
51	private CodeAssistAdvancedConfigurationBlock fConfigurationBlock;
52
53	public final Image fRemoveProposalListImage;
54
55	public final Image fRemoveProposalListOverImage;
56
57	public CodeAssistAdvancedUtilitiesProxy(CodeAssistAdvancedConfigurationBlock configurationBlock) {
58	this.fConfigurationBlock= configurationBlock;
59	fRemoveProposalListImage= getImage(REMOVE_PROPOSAL_LIST_ICON_DESCRIPTOR);
60	fRemoveProposalListOverImage= getImage(REMOVE_PROPOSAL_LIST_OVER_ICON_DESCRIPTOR);
61	}
62
63	public void updateControls() {
64	fConfigurationBlock.updateControls();
65	}
66
67	public int computeWidth(Control control, String name) {
68	return fConfigurationBlock.computeWidth(control, name);
69	}
70
71	public Image getImage(ImageDescriptor imgDesc) {
72	return fConfigurationBlock.getImage(imgDesc);
73	}
74
75	public String getKeyboardShortcut(ParameterizedCommand command) {
76	return CodeAssistAdvancedConfigurationBlock.getKeyboardShortcut(command);
77	}
78
79	public String setValue(String value) {
80	return fConfigurationBlock.setValue(CodeAssistAdvancedConfigurationBlock.PREF_PROPOSAL_LISTS, value);
81	}
82
83	public String getValue() {
84	return fConfigurationBlock.getValue(CodeAssistAdvancedConfigurationBlock.PREF_PROPOSAL_LISTS);
85	}
86
87	public void validateSettings(String oldValue, String newValue) {
88	fConfigurationBlock.validateSettings(CodeAssistAdvancedConfigurationBlock.PREF_PROPOSAL_LISTS, oldValue, newValue);
89	}
90
91	public static int getCompatibleOperation(int operation, int supportedOperations, TransferData currentDataType) {
92	int result= ProvidedCategoryTransfer.getInstance().getCompatibleOperation(operation, supportedOperations, currentDataType);
93	if (result != -1)
94	return result;
95	result= ProposalListTransfer.getInstance().getCompatibleOperation(operation, supportedOperations, currentDataType);
96	if (result != -1)
97	return result;
98	result= ProposalListCategoryTransfer.getInstance().getCompatibleOperation(operation, supportedOperations, currentDataType);
99	if (result != -1)
100	return result;
101	return DND.DROP_NONE;
102	}
103	}

Lines 7-12 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/java/JavaTextMessages.properties (-2 / +3 lines)
7	#	7	#
8	# Contributors:	8	# Contributors:
9	# IBM Corporation - initial API and implementation	9	# IBM Corporation - initial API and implementation
		10	# Thomas Schlosser <schlosser@stud.tu-darmstadt.de> - 340876 [preferences][content assist] Request for more flexible configuration of content assist lists - https://bugs.eclipse.org/bugs/show_bug.cgi?id=340876
10	###############################################################################	11	###############################################################################
11		12
12	CompletionProcessor_error_accessing_title=Error Accessing Compilation Unit	13	CompletionProcessor_error_accessing_title=Error Accessing Compilation Unit
Lines 57-70 Link Here
57	ContentAssistProcessor_all_disabled_preference_link=Change the settings on the <a>Advanced Content Assist preference page</a> or click ''{0}'' to restore the default behavior.	58	ContentAssistProcessor_all_disabled_preference_link=Change the settings on the <a>Advanced Content Assist preference page</a> or click ''{0}'' to restore the default behavior.
58	ContentAssistProcessor_collecting_contexts=Collecting context information	59	ContentAssistProcessor_collecting_contexts=Collecting context information
59	ContentAssistProcessor_sorting_contexts=Sorting	60	ContentAssistProcessor_sorting_contexts=Sorting
60	ContentAssistProcessor_defaultProposalCategory=Default Proposals	61	ContentAssistProcessor_proposalList={0}. Proposal List
61	# {0} will be replaced by a keyboard shortcut (accelerator)	62	# {0} will be replaced by a keyboard shortcut (accelerator)
62	ContentAssistProcessor_toggle_affordance_press_gesture=Press ''{0}''	63	ContentAssistProcessor_toggle_affordance_press_gesture=Press ''{0}''
63	ContentAssistProcessor_toggle_affordance_click_gesture=Click	64	ContentAssistProcessor_toggle_affordance_click_gesture=Click
64	# {0} will be replaced by a title describing the displayed proposal category, {1} by either the press_gesture or click_gesture message above, {2} by the name of the next proposal category	65	# {0} will be replaced by a title describing the displayed proposal category, {1} by either the press_gesture or click_gesture message above, {2} by the name of the next proposal category
65	ContentAssistProcessor_toggle_affordance_update_message={1} to show {2}	66	ContentAssistProcessor_toggle_affordance_update_message={1} to show {2}
66	# {0} will be replaced by a title describing the displayed proposal category	67	# {0} will be replaced by a title describing the displayed proposal category
67	ContentAssistProcessor_empty_message= No {0}	68	ContentAssistProcessor_empty_message= No proposals in {0}
68		69
69	ContentAssistHistory_serialize_error=Problems writing content assist history to XML	70	ContentAssistHistory_serialize_error=Problems writing content assist history to XML
70	ContentAssistHistory_deserialize_error=Problems reading content assist history from XML	71	ContentAssistHistory_deserialize_error=Problems reading content assist history from XML