Attachment #188880 for bug #231081




/*******************************************************************************
 * Copyright (c) 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.ui.internal.views.markers;

import java.util.Collection;
import java.util.Iterator;

import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
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.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.events.ExpansionEvent;
import org.eclipse.ui.forms.events.IExpansionListener;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.views.markers.FilterConfigurationArea;
import org.eclipse.ui.views.markers.internal.MarkerMessages;

/**
 * @since 3.7
 *
 */
public class ConfigurationEditDialog extends TitleAreaDialog {

	private final MarkerContentGenerator generator;
	private ScrolledForm form;
	private Collection configAreas;
	private GroupFilterConfigurationArea scopeArea = new ScopeArea();
	private final MarkerFieldFilterGroup filterGroup;
	private Text nameText;
	private Collection currentConfigurationNames;

	/**
	 * @param parentShell
	 */
	protected ConfigurationEditDialog(Shell parentShell, MarkerContentGenerator generator, MarkerFieldFilterGroup markerFieldFilterGroup) {
		super(parentShell);
		this.generator = generator;
		this.filterGroup = markerFieldFilterGroup;
		setHelpAvailable(false);
	}
	
	protected int getShellStyle() {
		return super.getShellStyle() | SWT.RESIZE;
	}

	/* 
	 * (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
	 * 
	 */
	protected Control createDialogArea(Composite parent) {
		Composite container = (Composite) super.createDialogArea(parent);
		
		Composite composite = new Composite(container, SWT.NONE);
		composite.setLayout(new GridLayout());
		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
		
		Composite nameComposite = new Composite(composite, SWT.NONE);
		nameComposite.setLayout(new GridLayout(2, false));
		nameComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		
		Label label = new Label(nameComposite, SWT.NONE);
		label.setText(MarkerMessages.configEditDialog_name);
		nameText = new Text(nameComposite, SWT.BORDER);
		nameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		nameText.addModifyListener(new ModifyListener() {
			
			public void modifyText(ModifyEvent e) {
				validate();				
			}
		});
		
		final FormToolkit toolkit = new FormToolkit(composite.getDisplay());
		composite.addDisposeListener(new DisposeListener() {
			public void widgetDisposed(DisposeEvent e) {
				toolkit.dispose();
			}
		});
		form = toolkit.createScrolledForm(composite);
		form.setBackground(composite.getBackground());

		form.getBody().setLayout(new GridLayout());

		configAreas = generator.createFilterConfigurationFields();

		createFieldArea(toolkit, form, scopeArea, true);
		Iterator areas = configAreas.iterator();
		while (areas.hasNext()) {
			createFieldArea(toolkit, form,
					(FilterConfigurationArea) areas.next(), true);
		}

		initUI();

		return container;
	}

	private void initUI() {

		setTitle(MarkerMessages.ConfigurationEditDialog_title);
		setMessage(MarkerMessages.ConfigurationEditDialog_message);

		nameText.setText(filterGroup.getName());
		scopeArea.initializeFromGroup(filterGroup);
		Iterator areas = configAreas.iterator();
		while (areas.hasNext()) {
			FilterConfigurationArea area = (FilterConfigurationArea) areas
					.next();
			if (area instanceof GroupFilterConfigurationArea)
				((GroupFilterConfigurationArea) area)
						.initializeFromGroup(filterGroup);
			area.initialize(filterGroup.getFilter(area.getField()));
		}
	}
	
	/**
	 * Create a field area in the form for the FilterConfigurationArea
	 * 
	 * @param toolkit
	 * @param form
	 * @param area
	 * @param expand
	 *            <code>true</code> if the area should be expanded by default
	 */
	private void createFieldArea(final FormToolkit toolkit,
			final ScrolledForm form, final FilterConfigurationArea area,
			boolean expand) {
		final ExpandableComposite expandable = toolkit
				.createExpandableComposite(form.getBody(),
						ExpandableComposite.TWISTIE);
		expandable.setText(area.getTitle());
		expandable.setBackground(form.getBackground());
		expandable.setLayout(new GridLayout());
		expandable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, area
				.grabExcessVerticalSpace()));
		expandable.addExpansionListener(new IExpansionListener() {
			/*
			 * (non-Javadoc)
			 * 
			 * @see
			 * org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanged
			 * (org.eclipse.ui.forms.events.ExpansionEvent)
			 */
			public void expansionStateChanged(ExpansionEvent e) {
				expandable.getParent().layout(true);

			}

			/*
			 * (non-Javadoc)
			 * 
			 * @see
			 * org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanging
			 * (org.eclipse.ui.forms.events.ExpansionEvent)
			 */
			public void expansionStateChanging(ExpansionEvent e) {

			}
		});

		Composite sectionClient = toolkit.createComposite(expandable);
		sectionClient.setLayout(new GridLayout());
		sectionClient.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true,
				false));
		sectionClient.setBackground(form.getBackground());
		area.createContents(sectionClient);
		expandable.setClient(sectionClient);
		expandable.setExpanded(expand);
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
	 */
	protected void okPressed() {
		applyValues();
		super.okPressed();
	}

	private void applyValues() {
		scopeArea.applyToGroup(filterGroup);
		Iterator areas = configAreas.iterator();
		while (areas.hasNext()) {
			FilterConfigurationArea area = (FilterConfigurationArea) areas
					.next();

			// Handle the internal special cases
			if (area instanceof GroupFilterConfigurationArea)
				((GroupFilterConfigurationArea) area)
						.applyToGroup(filterGroup);
			area.apply(filterGroup.getFilter(area.getField()));
		}
	}
	
	private void validate() {
		Button okButton = getButton(IDialogConstants.OK_ID);
		if(okButton == null)
			return;
		String name = nameText.getText();
		if(currentConfigurationNames.contains(name) && !filterGroup.getName().equals(name)) {
			String message = NLS.bind(MarkerMessages.filtersDialog_conflictingName, name);
			setErrorMessage(message);
			okButton.setEnabled(false);
		}else {
			setErrorMessage(null);
			okButton.setEnabled(true);
		}
	}

	public void setCurrentConfigurationNames(
			Collection currentConfigurationNames) {
		this.currentConfigurationNames = currentConfigurationNames;
	}

}




						.getConfigurationElement().getAttribute(
								MarkerSupportInternalUtilities.ATTRIBUTE_ID));
				// Make sure we get a useful value
				if (value != null && value.intValue() >= 0)
					preferredWidth = value.intValue();
			}
		}
		if (preferredWidth < 0) {
			// Compute and store a font metric
			GC gc = new GC(tree);
			gc.setFont(tree.getFont());

			fields[positions[i]] = (MarkerField) column.getData(MARKER_FIELD);
		}
		if (generator != null) {
			generator.saveState(memento, fields);
		}
		builder.saveState(memento);
	}




/*******************************************************************************
 * Copyright (c) 2007, 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

import java.util.Collection;
import java.util.Iterator;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;

import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.ui.forms.events.ExpansionEvent;
import org.eclipse.ui.forms.events.IExpansionListener;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.internal.ide.IDEInternalPreferences;
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.preferences.ViewSettingsDialog;
import org.eclipse.ui.views.markers.internal.MarkerMessages;

/**

 * @since 3.3
 * 
 */
public class FiltersConfigurationDialog extends ViewSettingsDialog {

	private static final String SELECTED_FILTER_GROUP = "SELECTED_FILTER_GROUP"; //$NON-NLS-1$

	private Collection filterGroups;

	private CheckboxTableViewer configsTable;

	private GroupFilterConfigurationArea scopeArea = new ScopeArea();

	private MarkerFieldFilterGroup selectedFilterGroup;

	private ScrolledForm form;

	private MarkerContentGenerator generator;

	private int limitValue = -1;
	private boolean limitEnabled = false;
	private boolean andFilters = false;

	private Collection filterAreas;

	private Button removeButton;
	private Button editButton;
	private Button allButton;
	private Button andButton;
	private Button orButton;

	private Button limitButton;
	private Spinner limitSpinner;
	private Button limitBttn;

	/**
	 * Create a new instance of the receiver on builder.

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.dialogs.Dialog#close()
	 */
	public boolean close() {
		saveDialogSettings();
		return super.close();
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.internal.views.markers.ViewerSettingsAndStatusDialog#
	 * configureShell(org.eclipse.swt.widgets.Shell)
	 */

	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.internal.views.markers.ViewerSettingsAndStatusDialog#
	 * initializeDialog()
	 */
	protected void initializeDialog() {
		super.initializeDialog();
		validateState();
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.internal.views.markers.ViewerSettingsAndStatusDialog#
	 * createDialogContentArea(org.eclipse.swt.widgets.Composite)
	 */
	protected Control createDialogArea(Composite parent) {

		Composite container = (Composite) super.createDialogArea(parent);
		
		Composite composite = new Composite(container, SWT.NONE);
		composite.setLayout(new GridLayout());
		composite.setLayoutData(new GridData(GridData.FILL_BOTH));

		createAndOrButtons(composite);
		
		createFilters(composite);
		
		createMarkerLimits(composite);
		
		loadDialogSettings();
		applyDialogFont(container);
		
		initUI();
		
		return container;
	}
	
	private void initUI() {
		
		if (selectedFilterGroup != null) {
			configsTable.setSelection(new StructuredSelection(
					selectedFilterGroup));
		}

		configsTable.setInput(filterGroups);
		Iterator iterator = filterGroups.iterator();
		while (iterator.hasNext()) {
			MarkerFieldFilterGroup group = (MarkerFieldFilterGroup) iterator
					.next();
			boolean enabled = group.isEnabled();
			configsTable.setChecked(group, enabled);
		}
		createVerticalSeperator(top).setLayoutData(
				new GridData(SWT.NONE, SWT.FILL, false, true));
		createFilterAreas(top).setLayoutData(
				new GridData(SWT.FILL, SWT.FILL, true, true));

		andButton.setSelection(andFilters);
		orButton.setSelection(!andFilters);
		updateRadioButtonsFromTable();
		int limits = generator.getMarkerLimits();
		boolean limitsEnabled = limits != -1;
		limitButton.setSelection(limitsEnabled);
		limitSpinner.setEnabled(limitsEnabled);
		if(limitsEnabled)
			limitSpinner.setSelection(limits);
		else
			limitSpinner.setSelection(1);
		updateButtonEnablement();
		configsTable.getTable().setFocus();
		
	}

	private void updateRadioButtonsFromTable() {
		
		boolean showAll = isShowAll();
		allButton.setSelection(showAll);
		andButton.setEnabled(!showAll);
		orButton.setEnabled(!showAll);
	}

	private void updateShowAll(boolean showAll) {
		
		allButton.setSelection(showAll);
		andButton.setEnabled(!showAll);
		orButton.setEnabled(!showAll);
		if(showAll) {
			configsTable.setAllChecked(false);
		}else {
			// make the first entry checked
			if(filterGroups.size() > 0) {
				Object group = filterGroups.iterator().next();
				configsTable.setChecked(group, true);
			}
		}
	}

	private boolean isShowAll() {
		return configsTable.getCheckedElements().length == 0;
	}
	/**
	 * @param parent
	 *            parent
	 * @return {@link Control}
	 */
	private void createMarkerLimits(Composite parent) {
		
		limitButton = new Button(parent, SWT.CHECK);
		limitButton.setText(MarkerMessages.MarkerPreferences_MarkerLimits);
		limitButton.addSelectionListener(new SelectionAdapter() {
			
			public void widgetSelected(SelectionEvent e) {
				limitSpinner.setEnabled(limitButton.getSelection());
			}
		});

		Composite composite = new Composite(parent, SWT.NONE);
		composite.setLayout(new GridLayout(2, false));
		GridData compositeData = new GridData(GridData.FILL_HORIZONTAL);
		compositeData.horizontalIndent = convertHorizontalDLUsToPixels(IDialogConstants.INDENT);
		composite.setLayoutData(compositeData);
		
		Label label = new Label(composite, SWT.NONE);
		label.setText(MarkerMessages.MarkerPreferences_VisibleItems);
		
		limitSpinner = new Spinner(composite, SWT.BORDER);
		limitSpinner.setMinimum(1);
		limitSpinner.setMaximum(Integer.MAX_VALUE);
		limitSpinner.setIncrement(1);
		limitSpinner.setPageIncrement(100);
		GridData spinnerData = new GridData();
		spinnerData.minimumWidth = convertWidthInCharsToPixels(6);
		limitSpinner.setLayoutData(spinnerData);
		
	}

	/**
	 * Create element limit area.
	 * 
	 * @param parent
	 */
	private void createFilters(Composite parent) {
		
		Composite composite = new Composite(parent, SWT.NONE);
		composite.setLayout(new GridLayout(2, false));
		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		composite.setBackground(parent.getBackground());
		
		configsTable = CheckboxTableViewer.newCheckList(composite, SWT.BORDER);
		GridData tableData = new GridData(SWT.FILL, SWT.FILL, true, true);
		tableData.widthHint = convertHorizontalDLUsToPixels(200);
		configsTable.getControl().setLayoutData(tableData);
		
		configsTable.setContentProvider(ArrayContentProvider.getInstance());
		configsTable.setLabelProvider(new LabelProvider() {
				case SWT.Selection:
					boolean limited = limitBttn.getSelection();
					setLimitEnabled(limited);
					limitEditor.setEditable(limited);
					limitEditor.setText(Integer.toString(getLimitValue()));
					break;
				case SWT.Modify:
					try {
						int limit = Integer.parseInt(limitEditor.getText());
						if (limit > 0) {
							setLimitValue(limit);
						} else {
							limitEditor.setFocus();
						}
					} catch (Exception e) {
						limitEditor.setFocus();
					}
					break;
				}
				validateState();
			}
		};
		limitEditor.addListener(SWT.Modify, listener);
		limitBttn.addListener(SWT.Selection, listener);
		setLimitEnabled(IDEWorkbenchPlugin.getDefault().getPreferenceStore()
				.getBoolean(IDEInternalPreferences.USE_MARKER_LIMITS));
		setLimitValue(IDEWorkbenchPlugin.getDefault().getPreferenceStore()
				.getInt(IDEInternalPreferences.MARKER_LIMITS_VALUE));

		limitBttn.setSelection(isLimitEnabled());
		limitEditor.setText(Integer.toString(getLimitValue()));
		limitEditor.setEditable(isLimitEnabled());
		return composite;
	}

	/**
	 * Create the area for selecting the filters and enabling/disabling them.
	 * 
	 * @param main
	 * @return {@link Control}
	 */
	private Control createFilterSelectionArea(Composite main) {

		Composite filtersComposite = new Composite(main, SWT.NONE);
		filtersComposite.setLayout(new GridLayout(2, false));
		filtersComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
				true));

		Label title = new Label(filtersComposite, SWT.NONE);
		title.setText(MarkerMessages.filtersDialog_entriesTitle);
		GridData titleData = new GridData();
		titleData.horizontalSpan = 2;
		title.setLayoutData(titleData);

		filtersList = CheckboxTableViewer.newCheckList(filtersComposite,
				SWT.BORDER);

		filtersList.setContentProvider(new IStructuredContentProvider() {
			/*
			 * (non-Javadoc)
			 * 
			 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
			 */
			public void dispose() {
				// Do nothing
			}

			/*
			 * (non-Javadoc)
			 * 
			 * @see
			 * org.eclipse.jface.viewers.IStructuredContentProvider#getElements
			 * (java.lang.Object)
			 */
			public Object[] getElements(Object inputElement) {
				return filterGroups.toArray();
			}

			/*
			 * (non-Javadoc)
			 * 
			 * @see
			 * org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse
			 * .jface.viewers.Viewer, java.lang.Object, java.lang.Object)
			 */
			public void inputChanged(Viewer viewer, Object oldInput,
					Object newInput) {
				// Do nothing
			}
		});

		filtersList.setLabelProvider(new LabelProvider() {
			/*
			 * (non-Javadoc)
			 * 
			 * @see
			 * org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object
			 * )
			 */
			public String getText(Object element) {
				return ((MarkerFieldFilterGroup) element).getName();
			}
		});

		configsTable.addCheckStateListener(new ICheckStateListener() {
			public void checkStateChanged(CheckStateChangedEvent event) {
				updateRadioButtonsFromTable();
			}
		});

		configsTable
				.addSelectionChangedListener(new ISelectionChangedListener() {

					/*
					 * (non-Javadoc)
					 * 
					 * @see org.eclipse.jface.viewers.ISelectionChangedListener#
					 * selectionChanged
					 * (org.eclipse.jface.viewers.SelectionChangedEvent)
					 */
					public void selectionChanged(SelectionChangedEvent event) {
						updateButtonEnablement();
								.getSelection()).getFirstElement());
					}
				});

		configsTable.addDoubleClickListener(new IDoubleClickListener() {
			
			public void doubleClick(DoubleClickEvent event) {
				IStructuredSelection selection = (IStructuredSelection) configsTable.getSelection();
				MarkerFieldFilterGroup configuration = (MarkerFieldFilterGroup) selection.getFirstElement();
				editConfiguration(configuration);
			}
		});

		createButtons(composite);
		while (filterIterator.hasNext()) {
			MarkerFieldFilterGroup group = (MarkerFieldFilterGroup) filterIterator
					.next();
			filtersList.setChecked(group, group.isEnabled());
		}

	}
		listData.widthHint = convertHorizontalDLUsToPixels(100);
		filtersList.getControl().setLayoutData(listData);

	/**
	 * @param composite
	 */
	private void createButtons(Composite composite) {
		Composite buttons = new Composite(composite, SWT.NONE);
		GridLayout buttonLayout = new GridLayout();
		buttonLayout.marginWidth = 0;
		buttons.setLayout(buttonLayout);

		addNew.setText(MarkerMessages.MarkerFilter_addFilterName);
		addNew.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				addConfiguration();
			}
		});
		setButtonLayoutData(addNew);
		
		editButton = new Button(buttons, SWT.PUSH);
		editButton.setText(MarkerMessages.MarkerFilter_editFilterName);
		editButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				IStructuredSelection selection = (IStructuredSelection) configsTable.getSelection();
				MarkerFieldFilterGroup configuration = (MarkerFieldFilterGroup) selection.getFirstElement();
				editConfiguration(configuration);
			}
		});
		setButtonLayoutData(editButton);

		removeButton = new Button(buttons, SWT.PUSH);
		removeButton.setText(MarkerMessages.MarkerFilter_deleteSelectedName);
		removeButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				removeFilters(configsTable.getSelection());
			}
		});
		setButtonLayoutData(removeButton);
	}
	
	private boolean editConfiguration(MarkerFieldFilterGroup configuration) {
		
		ConfigurationEditDialog dialog = new ConfigurationEditDialog(getShell(), generator, configuration);
		dialog.setCurrentConfigurationNames(getCurrentConfigurationNames());
		if(dialog.open() == Window.CANCEL)
			return false;
		return true;

	}

	private void createAndOrButtons(Composite parent) {
	
		allButton = new Button(parent, SWT.CHECK);
		allButton.setText(MarkerMessages.ALL_Title);
		allButton.addSelectionListener(new SelectionAdapter() {
			public void widgetSelected(SelectionEvent e) {
				updateShowAll(allButton.getSelection());
						.getSelection()).getFirstElement();
				renameFilter(filterGroup);
			}
		});
		setButtonLayoutData(renameButton);

		andButton = new Button(parent, SWT.RADIO);
		GridData labelData = new GridData();
		labelData.horizontalSpan = 2;
		andOrLabel.setLayoutData(labelData);
		andOrLabel.setText(MarkerMessages.AND_OR_Label);

		andButton = new Button(filtersComposite, SWT.RADIO);
		GridData data = new GridData(GridData.FILL_HORIZONTAL, SWT.NONE, true,
				false);
		data.horizontalSpan = 2;
		data.horizontalIndent = IDialogConstants.INDENT;
		andButton.setLayoutData(data);
		andButton.setText(MarkerMessages.AND_Title);
		andButton.setSelection(andFilters);
		andButton.addSelectionListener(new SelectionAdapter() {

			/*
			 * (non-Javadoc)
			 * 
			 * @see
			 * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
			 * .swt.events.SelectionEvent)
			 */
			public void widgetSelected(SelectionEvent e) {
				andFilters = true;
			}
		});
		GridData andData = new GridData();
		andData.horizontalIndent = convertHorizontalDLUsToPixels(IDialogConstants.INDENT);
		andButton.setLayoutData(andData);

		orButton = new Button(parent, SWT.RADIO);
		data = new GridData(GridData.FILL_HORIZONTAL, SWT.NONE, true, false);
		data.horizontalSpan = 2;
		data.horizontalIndent = IDialogConstants.INDENT;
		orButton.setLayoutData(data);
		orButton.setText(MarkerMessages.OR_Title);
		orButton.setSelection(!andFilters);
		orButton.addSelectionListener(new SelectionAdapter() {

			/*
			 * (non-Javadoc)
			 * 
			 * @see
			 * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
			 * .swt.events.SelectionEvent)
			 */
			public void widgetSelected(SelectionEvent e) {
				andFilters = false;
			}
		});
		GridData orData = new GridData();
		orData.horizontalIndent = convertHorizontalDLUsToPixels(IDialogConstants.INDENT);
		orButton.setLayoutData(orData);
		
			}
		});
		return filtersComposite;
	}

	/**
	 * 
	 * @param parent
	 * @return {@link Control}
	 */
	private Control createVerticalSeperator(Composite parent) {
		Label seprator = new Label(parent, SWT.SEPARATOR | SWT.VERTICAL);
		return seprator;
	}

	/**
	 * 
	 * @param parent
	 * @return {@link Control}
	 */
	private Control createFilterAreas(Composite parent) {
		final FormToolkit toolkit = new FormToolkit(parent.getDisplay());
		parent.addDisposeListener(new DisposeListener() {
			public void widgetDisposed(DisposeEvent e) {
				toolkit.dispose();
			}
		});
		form = toolkit.createScrolledForm(parent);
		form.setBackground(parent.getBackground());

		form.getBody().setLayout(new GridLayout());

		filterAreas = generator.createFilterConfigurationFields();

		createFieldArea(toolkit, form, scopeArea, true);
		Iterator areas = filterAreas.iterator();
		while (areas.hasNext()) {
			createFieldArea(toolkit, form,
					(FilterConfigurationArea) areas.next(), true);
		}
		return form;
	}

	/**
	 * Create a field area in the form for the FilterConfigurationArea
	 * 
	 * @param toolkit
	 * @param form
	 * @param area
	 * @param expand
	 *            <code>true</code> if the area should be expanded by default
	 */
	private void createFieldArea(final FormToolkit toolkit,
			final ScrolledForm form, final FilterConfigurationArea area,
			boolean expand) {
		final ExpandableComposite expandable = toolkit
				.createExpandableComposite(form.getBody(),
						ExpandableComposite.TWISTIE);
		expandable.setText(area.getTitle());
		expandable.setBackground(form.getBackground());
		expandable.setLayout(new GridLayout());
		expandable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, area
				.grabExcessVerticalSpace()));
		expandable.addExpansionListener(new IExpansionListener() {
			/*
			 * (non-Javadoc)
			 * 
			 * @see
			 * org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanged
			 * (org.eclipse.ui.forms.events.ExpansionEvent)
			 */
			public void expansionStateChanged(ExpansionEvent e) {
				expandable.getParent().layout(true);

			}

			/*
			 * (non-Javadoc)
			 * 
			 * @see
			 * org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanging
			 * (org.eclipse.ui.forms.events.ExpansionEvent)
			 */
			public void expansionStateChanging(ExpansionEvent e) {

			}
		});

		Composite sectionClient = toolkit.createComposite(expandable);
		sectionClient.setLayout(new GridLayout());
		sectionClient.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true,
				false));
		sectionClient.setBackground(form.getBackground());
		area.createContents(sectionClient);
		expandable.setClient(sectionClient);
		expandable.setExpanded(expand);
	}

	/**

	 * 
	 * @return Collection
	 */
	private Collection getCurrentConfigurationNames() {
		Collection names = new ArrayList();
		Iterator filterIterator = filterGroups.iterator();
		while (filterIterator.hasNext()) {

		return names;
	}

	private void addConfiguration() {
		String newName = getNewConfigurationName(getCurrentConfigurationNames(), MarkerMessages.MarkerFilter_newFilterName);
		MarkerFieldFilterGroup configuration = createConfiguration(newName);
		boolean cancelPressed = editConfiguration(configuration);
		if(cancelPressed) {
			filterGroups.add(configuration);
			configsTable.refresh();
			configsTable.setSelection(new StructuredSelection(configuration));
			configsTable.setChecked(configuration, true);
			updateRadioButtonsFromTable();
		if (newName != null) {
			createNewFilter(newName, cloneSelected);
		}
	}

	private String getNewConfigurationName(final Collection avoidNames,
	 * Opens Input Dialog for a new filter name
	 * 
	 * @param avoidNames
	 *            filter names to avoid
	 * @param initialName
	 *            initial name of the filter
	 * @return new filter name or null if canceled
	 * 
	 */
	private String getNewFilterName(final Collection avoidNames,
			String initialName) {
		
		String configName = initialName;
		for (int i = 1; avoidNames.contains(configName); i++) {
			configName = initialName+ ' '+ i;
						: MarkerMessages.MarkerFilter_newFilterName,
				getNameValidator(avoidNames));
		if (Window.OK == newDialog.open()) {
			return newDialog.getValue();
		}
		return configName;
	}

	private MarkerFieldFilterGroup createConfiguration(String newName) {
	 * Get IInputValidator for checking if the new name is valid
	 * 
	 * @param avoidNames
	 * @return IInputValidator
	 */
	private IInputValidator getNameValidator(final Collection avoidNames) {
		return new IInputValidator() {
			public String isValid(String value) {
				String newText = value.trim();
				if (newText.length() == 0)
					return MarkerMessages.MarkerFilterDialog_emptyMessage;
				if (avoidNames.contains(newText))
					return NLS.bind(
							MarkerMessages.filtersDialog_conflictingName,
							newText);
				return null;
			}
		};
	}

		MarkerFieldFilterGroup config = new MarkerFieldFilterGroup(null,
	 * Create a new filterGroup, and adds it to the filterGroups
	 * 
	 * @param cloneSelected
	 *            true clones the selected filterGroup
	 * @param newName
	 *            name of new filterGroup
	 */
	private void createNewFilter(String newName, boolean cloneSelected) {
		MarkerFieldFilterGroup group = new MarkerFieldFilterGroup(null,
				generator);
		config.setName(newName);
		return config;
		}
		group.setName(newName);
		filterGroups.add(group);
		filtersList.refresh();
		filtersList.setSelection(new StructuredSelection(group));
		filtersList.setChecked(group, true);
		updateAndOrEnblement();
	}

	/**
	 * Renames the supplied MarkerFieldFilterGroup
	 * 
	 * @param filterGroup
	 */
	private void renameFilter(MarkerFieldFilterGroup filterGroup) {
		if (filterGroup != null) {
			Collection names = getCurrentFilterNames();
			String initial = null;
			initial = filterGroup.getName();
			names.remove(initial);
			String newName = getNewFilterName(names, initial);
			if (newName != null) {
				filterGroup.setName(newName);
				filtersList.update(filterGroup, null);
			}
		}
	}

	/**
	 * Enable/disable 'and', 'or' buttons
	 */
	private void updateAndOrEnblement() {
		if (filtersList.getCheckedElements().length == 0) {
			andOrLabel.setEnabled(false);
			andButton.setEnabled(false);
			orButton.setEnabled(false);
		} else {
			andOrLabel.setEnabled(true);
			andButton.setEnabled(true);
			orButton.setEnabled(true);
		}
	}

	/**

				MarkerFieldFilterGroup group = (MarkerFieldFilterGroup) groups
						.next();
				if (group.getName().equals(selection)) {
					configsTable.setSelection(new StructuredSelection(group));
					return;
				}
			}
		}

		// If there is no initial selection make one
		if(filterGroups.size() > 0) {
			configsTable.setSelection(new StructuredSelection(filterGroups
					.iterator().next()));
		}
	}

	/**

		return returnFilters;
	}

	private void validateState() {
		if (limitBttn == null || limitBttn.isDisposed()) {
			handleStatusUdpate(IStatus.INFO, null);
		} else {
			boolean limitLess = !limitBttn.getSelection();
			if (limitLess) {
				if (filtersList == null
						|| filtersList.getControl().isDisposed()) {
					handleStatusUdpate(IStatus.INFO, null);
				} else {
					boolean warnning = filtersList.getCheckedElements() == null
							|| filtersList.getCheckedElements().length == 0;
					if (warnning) {
						handleStatusUdpate(
								IStatus.WARNING,
								MarkerMessages.filtersDialogDeselectedFiltersMessage
										+ MarkerMessages.MarkerFilterDialog_YouHaveDisabledMarkerLimit);

					} else {
						handleStatusUdpate(
								IStatus.WARNING,
								MarkerMessages.MarkerFilterDialog_YouHaveDisabledMarkerLimit);
					}
				}
			} else {
				if (limitEditor == null || limitEditor.isDisposed()) {
					handleStatusUdpate(IStatus.INFO, null);
				} else {
					String value = limitEditor.getText().trim();
					boolean validLimit = value.length() != 0;
					if (validLimit) {
						try {
							int limit = Integer.parseInt(value);
							if (limit <= 0) {
								validLimit = false;
							}
						} catch (Exception e) {
							validLimit = false;
						}
					}
					if (filtersList == null
							|| filtersList.getControl().isDisposed()) {
						handleStatusUdpate(IStatus.INFO, null);
					} else {
						boolean warnning = filtersList.getCheckedElements().length == 0;
						if (validLimit) {
							if (warnning) {
								handleStatusUdpate(
										IStatus.WARNING,
										MarkerMessages.filtersDialogDeselectedFiltersMessage);
							} else {
								handleStatusUdpate(IStatus.INFO, null);
							}
						} else {
							handleStatusUdpate(IStatus.ERROR, null);
						}
					}
				}
			}
		}
	}

	/*
	 * (non-Javadoc)

	 */
	protected void okPressed() {

		int limits;
		
		if(limitButton.getSelection())
			limits = limitSpinner.getSelection();
		else
			limits = -1;
		
		generator.setMarkerLimits(limits);
		
						isLimitEnabled());
		IDEWorkbenchPlugin.getDefault().savePluginPreferences();

		Iterator filterGroupIterator = filterGroups.iterator();
		while (filterGroupIterator.hasNext()) {
			MarkerFieldFilterGroup group = (MarkerFieldFilterGroup) filterGroupIterator
					.next();
			group.setEnabled(configsTable.getChecked(group));
		}
		saveDialogSettings();

		super.okPressed();

	}

	/**
	 * 
	 * Updates the filterGroup with the values showing in the dialog's GUI.
	 * 
	 * @param filterGroup
	 * 
	 */
	private void captureStateInto(MarkerFieldFilterGroup filterGroup) {
		if (filterGroup != null) {

			scopeArea.applyToGroup(filterGroup);
			Iterator areas = filterAreas.iterator();
			while (areas.hasNext()) {
				FilterConfigurationArea area = (FilterConfigurationArea) areas
						.next();

				// Handle the internal special cases
				if (area instanceof GroupFilterConfigurationArea)
					((GroupFilterConfigurationArea) area)
							.applyToGroup(filterGroup);
				area.apply(filterGroup.getFilter(area.getField()));
			}
		}
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.preferences.ViewSettingsDialog#performDefaults()
	 */
	protected void performDefaults() {
		
		limitButton.setSelection(true);
		limitSpinner.setSelection(IDEWorkbenchPlugin.getDefault().getPreferenceStore()

		setLimitValue(IDEWorkbenchPlugin.getDefault().getPreferenceStore()
				.getDefaultInt(IDEInternalPreferences.MARKER_LIMITS_VALUE));
		limitEditor.setText(Integer.toString(getLimitValue()));

		filterGroups.clear();
		filterGroups.addAll(generator.getDeclaredFilters());
		configsTable.refresh();
		configsTable.setSelection(new StructuredSelection(
				filterGroups.size() > 1 ? filterGroups.iterator().next()
						: new Object[0]));
		andFilters = false;
		andButton.setSelection(andFilters);
		orButton.setSelection(!andFilters);
		updateRadioButtonsFromTable();
	}

	/**

	private void removeFilters(ISelection selection) {
		filterGroups.remove(((IStructuredSelection) selection)
				.getFirstElement());
		configsTable.refresh();
		updateRadioButtonsFromTable();
	}

	/**


	}

	private void updateButtonEnablement() {
		boolean empty = configsTable.getSelection().isEmpty();
		editButton.setEnabled(!empty);
		removeButton.setEnabled(!empty);
		return limitValue;
	}

	/**
	 * @param limitValue
	 *            The limitValue to set.
	 */
	private void setLimitValue(int limitValue) {
		this.limitValue = limitValue;
	}

	/**
	 * @return Returns true if limit is enabled.
	 */
	private boolean isLimitEnabled() {
		return limitEnabled;
	}

	/**
	 * @param limitEnabled
	 *            The limitEnabled to set.
	 */
	private void setLimitEnabled(boolean limitEnabled) {
		this.limitEnabled = limitEnabled;
	}

	/**
	 * Set the control and all of it's visibility state to visible.
	 * 
	 * @param visible
	 * @param control
	 */
	private void setEnabled(boolean visible, Control control) {
		control.setEnabled(visible);
		if (control instanceof Composite) {
			Control[] children = ((Composite) control).getChildren();
			for (int i = 0; i < children.length; i++) {
				setEnabled(visible, children[i]);
			}
		}
	}

	/**
	 * Set the enablement state of the fields to enabled.
	 */
	private void setFieldsEnabled(boolean visible) {
		setEnabled(visible, form);
	}

	/**
	 * Set the filter that is being worked on.
	 * 
	 * @param markerFieldFilterGroup
	 */
	private void setSelectedFilter(MarkerFieldFilterGroup markerFieldFilterGroup) {
		if (selectedFilterGroup == markerFieldFilterGroup) {
			return;
		}
		removeButton
				.setEnabled(!(markerFieldFilterGroup == null || markerFieldFilterGroup
						.isSystem()));
		renameButton
				.setEnabled(!(markerFieldFilterGroup == null || markerFieldFilterGroup
						.isSystem()));
		cloneButton.setEnabled(markerFieldFilterGroup != null);

		MarkerFieldFilterGroup old = selectedFilterGroup;
		selectedFilterGroup = markerFieldFilterGroup;
		if (old != null)
			scopeArea.applyToGroup(old);

		if (selectedFilterGroup == null) {
			setFieldsEnabled(false);
			return;
		}

		setFieldsEnabled(true);
		scopeArea.initializeFromGroup(selectedFilterGroup);
		Iterator areas = filterAreas.iterator();
		while (areas.hasNext()) {
			FilterConfigurationArea area = (FilterConfigurationArea) areas
					.next();
			if (old != null) {
				if (area instanceof GroupFilterConfigurationArea)
					((GroupFilterConfigurationArea) area).applyToGroup(old);
				area.apply(old.getFilter(area.getField()));
			}
			if (area instanceof GroupFilterConfigurationArea)
				((GroupFilterConfigurationArea) area)
						.initializeFromGroup(selectedFilterGroup);
			area.initialize(selectedFilterGroup.getFilter(area.getField()));
		}
	}
}




	private static final String TAG_GROUP_ENTRY = "filterGroup"; //$NON-NLS-1$
	private static final String TAG_AND = "andFilters"; //$NON-NLS-1$
	private static final String TAG_LEGACY_FILTER_ENTRY = "filter"; //$NON-NLS-1$
	private static final String TAG_MARKER_LIMIT = "markerLimit"; //$NON-NLS-1$
	
	/*Use this to indicate filter change rather than a null*/
	private final Collection FILTERS_CHANGED = Collections.EMPTY_SET;

	private Collection enabledFilters;
	private Collection filters;
	private boolean andFilters = false;
	private int markerLimits = 100;

	/**
	 * focusResources

		return hidden.toArray();
	}

	void saveState(IMemento memento, MarkerField[] displayedFields) {

		memento.putInteger(TAG_MARKER_LIMIT, markerLimits);

	void saveSate(IMemento memento, MarkerField[] displayedFields) {
		for (int i = 0; i < displayedFields.length; i++) {
			memento.createChild(TAG_COLUMN_VISIBILITY, displayedFields[i]
					.getConfigurationElement().getAttribute(

	}

	void restoreState(IMemento memento) {
		initialiseVisibleFields(memento);
	}

	/**
	 * Initialize the visible fields based on the initial settings or the
	 * contents of the {@link IMemento}
	 * 
	 * @param memento
	 *            IMemento
	 */
	private void initialiseVisibleFields(IMemento memento) {

		initDefaults();
				|| memento.getChildren(TAG_COLUMN_VISIBILITY).length == 0) {
			MarkerField[] initialFields = getInitialVisible();

		if (memento == null) {
			System.arraycopy(initialFields, 0, visibleFields, 0,
					initialFields.length);
			return;
		}
		
		Integer limits = memento.getInteger(TAG_MARKER_LIMIT);
		if(limits != null) {
			markerLimits = limits.intValue();
		MarkerField[] all = getAllFields();
		Hashtable allTable = new Hashtable();

		for (int i = 0; i < all.length; i++) {
			allTable.put(all[i].getConfigurationElement().getAttribute(
					MarkerSupportInternalUtilities.ATTRIBUTE_ID), all[i]);
		}
		
		if (memento.getChildren(TAG_COLUMN_VISIBILITY).length != 0) {

			IMemento[] visible = memento.getChildren(TAG_COLUMN_VISIBILITY);
			Collection newVisible = new ArrayList();
	
			MarkerField[] all = getAllFields();
			Hashtable allTable = new Hashtable();
	
			for (int i = 0; i < all.length; i++) {
				allTable.put(all[i].getConfigurationElement().getAttribute(
						MarkerSupportInternalUtilities.ATTRIBUTE_ID), all[i]);
			}
	
			for (int i = 0; i < visible.length; i++) {
				String key = visible[i].getID();
				if (allTable.containsKey(key)) {
					newVisible.add(allTable.get(key));
				}
			}
	
			visibleFields = new MarkerField[newVisible.size()];
			newVisible.toArray(visibleFields);
		}
	}

	private void initDefaults() {
		
		IPreferenceStore preferenceStore = IDEWorkbenchPlugin.getDefault().getPreferenceStore();
		if(preferenceStore.getBoolean(IDEInternalPreferences.USE_MARKER_LIMITS))
			markerLimits = preferenceStore.getInt(IDEInternalPreferences.MARKER_LIMITS_VALUE);

		MarkerField[] initialFields = getInitialVisible();

		visibleFields = new MarkerField[initialFields.length];
		System.arraycopy(initialFields, 0, visibleFields, 0,
				initialFields.length);

		visibleFields = new MarkerField[newVisible.size()];
		newVisible.toArray(visibleFields);
	}

	/**

	boolean andFilters() {
		return andFilters;
	}
	
	/**
	 * @return Returns the markerLimits.
	 */
	public int getMarkerLimits() {
		return markerLimits;
	}
	
	/**
	 * @param markerLimits The markerLimits to set.
	 */
	public void setMarkerLimits(int markerLimits) {
		this.markerLimits = markerLimits;
	}

	/**
	 * @return Collection of declared MarkerFieldFilterGroup(s)





import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.views.markers.internal.MarkerMessages;

/**


	private Button toVisibleBtt, toNonVisibleBtt;

	private Spinner widthSpinner;

	/**
	 * A listener to validate positive integer numbers only
	 */
	Listener postiveIntTextListener = new Listener() {
		private String intialValue;

		public void handleEvent(Event event) {
			intialValue = intialValue != null ? intialValue : Integer
					.toString(0);
			intialValue = handleIntegerFieldChange(event, intialValue);
		}
	};

	/**
	 * Create a new instance of the receiver.

	 * @see org.eclipse.ui.internal.views.markers.ViewerSettingsAndStatusDialog#createDialogContentArea(org.eclipse.swt.widgets.Composite)
	 */
	protected Control createDialogContentArea(Composite dialogArea) {
		Composite composite = new Composite(dialogArea, SWT.NONE);
		composite.setLayout(new GridLayout(4, false));
		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
		
		createInvisibleTable(composite);
		createMoveButtons(composite);
		createVisibleTable(composite);
		createUpDownBtt(composite);
		createWidthArea(composite);
		return composite;
	}
	
	/**
	 * Create the controls to configure columns.
	 * 
	 * @param dialogArea
	 * @return {@link Control}
	 */
	Control createColumnsArea(Composite dialogArea) {
		Group columnArea = new Group(dialogArea, SWT.NONE);
		columnArea.setLayout(new GridLayout(4, false));
		GridData gData = new GridData(GridData.FILL_BOTH
				| GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
		columnArea.setLayoutData(gData);
		columnArea.setText(MarkerMessages.MarkerPreferences_ColumnGroupTitle);

		createInvisibleTable(columnArea);
		createMoveButtons(columnArea);
		createVisibleTable(columnArea);
		createUpDownBtt(columnArea);
		createWidthArea(columnArea);
		return columnArea;
	}

	/**
	 * The Up and Down button to change column ordering.

	Control createUpDownBtt(Composite parent) {
		Composite composite = new Composite(parent, SWT.NONE);
		GridLayout layout = new GridLayout(1, true);
		layout.horizontalSpacing = 0;
		layout.marginRight = -1;
		layout.marginLeft = -1;
		layout.marginWidth = 0;
		composite.setLayout(layout);
		GridData gridData = new GridData(GridData.FILL_VERTICAL);
		gridData.verticalIndent = convertHeightInCharsToPixels(1);
		composite.setLayoutData(gridData);
		upButton = new Button(composite, SWT.PUSH);
		upButton.setText(JFaceResources.getString("ConfigureColumnsDialog_up")); //$NON-NLS-1$
		upButton.addListener(SWT.Selection, new Listener() {

				handleUpButton(event);
			}
		});
		setButtonLayoutData(upButton);
		upButton.setEnabled(false);

		downButton = new Button(composite, SWT.PUSH);

				handleDownButton(event);
			}
		});
		setButtonLayoutData(downButton);
		downButton.setEnabled(false);
		return composite;
	}

		gridData.horizontalSpan = 3;
		widthLabel.setLayoutData(gridData);

		widthSpinner = new Spinner(parent, SWT.BORDER);
		widthSpinner.setMinimum(1);
		widthSpinner.setSelection(1);
		widthSpinner.setMaximum(10000);
		gridData = new GridData();
		gridData.minimumWidth = convertWidthInCharsToPixels(5);
		widthSpinner.setLayoutData(gridData);
		widthSpinner.addFocusListener(new FocusAdapter() {
			public void focusLost(FocusEvent e) {
				Object data = ((IStructuredSelection) visibleViewer
						.getSelection()).getFirstElement();
				if (data != null) {
					IColumnUpdater updater = getColumnUpdater();
					updater.setColumnWidth(data, widthSpinner.getSelection());
								.getSelection()).getFirstElement();
						if (data != null) {
							IColumnUpdater updater = getColumnUpdater();
							updater.setColumnWidth(data, width);
						}
					} catch (Exception e) {
						return;// ignore
					}
				}
			}
		});
		widthSpinner.setEnabled(false);
		return widthSpinner;
		return widthText;
	}

	/**
	 * Adapter to {@link IStructuredContentProvider}
	 */
	abstract class ContentProviderAdapter implements IStructuredContentProvider {

		public void dispose() {
		}

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

	/**

	 * @return {@link Control}
	 */
	Control createVisibleTable(Composite parent) {

		Composite composite = new Composite(parent, SWT.NONE);
		composite.setLayout(new GridLayout(1, false));
		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
		
		Label label = new Label(composite, SWT.NONE);
		label.setText(MarkerMessages.MarkerPreferences_VisibleColumnsTitle);

		final Table table = new Table(composite, SWT.BORDER | SWT.MULTI);
		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
		data.widthHint = convertWidthInCharsToPixels(20);
		data.heightHint = table.getItemHeight() * 15;
		table.setLayoutData(data);
		table.setHeaderVisible(true);

		final TableColumn column = new TableColumn(table, SWT.NONE);
		column.setText(MarkerMessages.MarkerPreferences_VisibleColumnsTitle);


		visibleViewer = new TableViewer(table);
		visibleViewer.setLabelProvider(doGetLabelProvider());
		visibleViewer.setContentProvider(ArrayContentProvider.getInstance());
			public Object[] getElements(Object inputElement) {
				return getVisible().toArray();
			}
		});
		visibleViewer
				.addSelectionChangedListener(new ISelectionChangedListener() {
					public void selectionChanged(SelectionChangedEvent event) {

				handleToNonVisibleButton(event);
			}
		});
		visibleViewer.setInput(getVisible());
		return table;
	}


	 * @return {@link Control}
	 */
	Control createInvisibleTable(Composite parent) {
		
		Composite composite = new Composite(parent, SWT.NONE);
		composite.setLayout(new GridLayout(1, false));
		composite.setLayoutData(new GridData(GridData.FILL_BOTH));

		Label label = new Label(composite, SWT.NONE);
		label.setText(MarkerMessages.MarkerPreferences_HiddenColumnsTitle);
		
		final Table table = new Table(composite, SWT.BORDER | SWT.MULTI);
		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
		data.widthHint = convertWidthInCharsToPixels(20);
		data.heightHint = table.getItemHeight() * 15;
		table.setLayoutData(data);
		table.setHeaderVisible(true);

		final TableColumn column = new TableColumn(table, SWT.NONE);
		column.setText(MarkerMessages.MarkerPreferences_HiddenColumnsTitle);


		nonVisibleViewer = new TableViewer(table);
		nonVisibleViewer.setLabelProvider(doGetLabelProvider());
		nonVisibleViewer.setContentProvider(ArrayContentProvider.getInstance());
			public Object[] getElements(Object inputElement) {
				return getNonVisible().toArray();
			}
		});
		nonVisibleViewer
				.addSelectionChangedListener(new ISelectionChangedListener() {
					public void selectionChanged(SelectionChangedEvent event) {

				handleToVisibleButton(event);
			}
		});
		nonVisibleViewer.setInput(getNonVisible());
		return table;
	}


	Control createMoveButtons(Composite parent) {
		Composite bttArea = new Composite(parent, SWT.NONE);
		bttArea.setLayout(new GridLayout(1, true));
		GridData gridData = new GridData(GridData.FILL_VERTICAL);
		gridData.verticalIndent = convertHeightInCharsToPixels(1);
		bttArea.setLayoutData(gridData);

		toVisibleBtt = new Button(bttArea, SWT.PUSH);
		toVisibleBtt
				.setText(getDefaultOrientation() == SWT.RIGHT_TO_LEFT ? MarkerMessages.MarkerPreferences_MoveLeft
						: MarkerMessages.MarkerPreferences_MoveRight);
		setButtonLayoutData(toVisibleBtt);
		toVisibleBtt.addListener(SWT.Selection, new Listener() {
			public void handleEvent(Event event) {
				handleToVisibleButton(event);
			}
		});
		toVisibleBtt.setEnabled(false);

		toNonVisibleBtt = new Button(bttArea, SWT.PUSH);
		toNonVisibleBtt
				.setText(getDefaultOrientation() == SWT.RIGHT_TO_LEFT ? MarkerMessages.MarkerPreferences_MoveRight
						: MarkerMessages.MarkerPreferences_MoveLeft);
		setButtonLayoutData(toNonVisibleBtt);

		toNonVisibleBtt.addListener(SWT.Selection, new Listener() {
			public void handleEvent(Event event) {

		});
		toNonVisibleBtt.setEnabled(false);

		toVisibleBtt = new Button(bttArea, SWT.PUSH);
		toVisibleBtt
				.setText(getDefaultOrientation() == SWT.RIGHT_TO_LEFT ? MarkerMessages.MarkerPreferences_MoveLeft
						: MarkerMessages.MarkerPreferences_MoveRight);
		toVisibleBtt.setLayoutData(new GridData());
		toVisibleBtt.addListener(SWT.Selection, new Listener() {
			public void handleEvent(Event event) {
				handleToVisibleButton(event);
			}
		});
		toVisibleBtt.setEnabled(false);
		return bttArea;
	}

	/**
	 * 
	 * @param event
	 * @param intialvalue
	 * @return new value in String
	 */
	String handleIntegerFieldChange(Event event, String intialvalue) {
		String value = ((Text) event.widget).getText().trim();
		boolean editable = ((Text) event.widget).getEditable();
		switch (event.type) {
		case SWT.KeyDown:
		case SWT.Modify:
		case SWT.FocusOut:
			if (!editable) {
				handleStatusUdpate(IStatus.INFO, null);
				break;
			}
			if (value.length() == 0) {
				handleStatusUdpate(IStatus.ERROR, null);
			} else {
				try {
					int number = Integer.parseInt(value);
					if (number > 0) {
						handleStatusUdpate(IStatus.INFO, null);
					} else {
						value = intialvalue;
						((Text) event.widget).selectAll();
						handleStatusUdpate(IStatus.ERROR, getErrorMessage());
					}
				} catch (Exception e) {
					value = intialvalue;
					((Text) event.widget).selectAll();
					handleStatusUdpate(IStatus.ERROR, getErrorMessage());
				}
			}
		}
		return value;
	}

	/**
	 * Handles a selection change in the viewer that lists out the non-visible
	 * columns
	 * 

	void handleNonVisibleSelection(ISelection selection) {
		Object[] nvKeys = ((IStructuredSelection) selection).toArray();
		toVisibleBtt.setEnabled(nvKeys.length > 0);
		widthSpinner.setEnabled(false);
		if (visibleViewer.getControl().isFocusControl()
				&& getVisible().size() <= 1) {
			handleStatusUdpate(IStatus.INFO,


		boolean edit = selVCols.size() == 1 ? infoProvider
				.isColumnResizable(selVCols.get(0)) : false;
		widthSpinner.setEnabled(edit);
		if (edit) {
			widthSpinner.setSelection(infoProvider
					.getColumnWidth(selVCols.get(0)));
		} else {
			widthSpinner.setSelection(0);
		}
	}



	}

	// //////////////////////////////////////////////////////////////////////////////////
}




deleteActionConfirmTitle = Delete Selected Entries
deleteActionConfirmMessage = Do you want to delete the selected entries? Deleted markers may be recreated by a build or may not be recoverable.

configEditDialog_name = &Name:

filtersDialog_title = Filters
filtersDialog_entriesTitle = &Configurations:
filtersDialog_showItemsOfType = Show items of &type:

RemoveMarker_errorTitle=Error

MarkerFilter_defaultFilterName=Default
MarkerFilter_newFilterName=New Configuration
MarkerFilter_filtersTitle=User f&ilters:
MarkerFilter_addFilterName=&New...
MarkerFilter_cloneFilterName=D&uplicate...
MarkerFilter_editFilterName=&Edit...
MarkerFilter_deleteSelectedName = Remo&ve
MarkerFilter_renameName = &Rename
MarkerFilter_showAllCommand_title = &Show All
MarkerFilter_ConfigureContentsCommand_title = &Configure Contents...

MarkerFilterDialog_title=Filter Name
MarkerFilterDialog_message=Select a filter name
MarkerFilterDialog_emptyMessage=Name must not be empty
ALL_Title = &Show all items
AND_Title = Show items that match a&ll the configurations checked below
OR_Title = Show items that match a&ny configuration checked below

MarkerFilterDialog_errorTitle = An error has occurred
MarkerFilterDialog_failedFilterMessage = Could not create filter {0}. 

MarkerPreferences_DialogTitle = Preferences
MarkerPreferences_MarkerLimits = Use item &limits
MarkerPreferences_MoveLeft = &Hide <
MarkerPreferences_MoveRight = &Show >
MarkerPreferences_MoveRight = &>>
MarkerPreferences_ColumnGroupTitle = Hide/Show Columns
MarkerPreferences_VisibleColumnsTitle = &Shown:
MarkerPreferences_HiddenColumnsTitle = &Hidden:
MarkerPreferences_AtLeastOneVisibleColumn = There must be at least one visible column.
MarkerPreferences_VisibleItems = &Number of items visible per group:
MarkerFilterDialog_YouHaveDisabledMarkerLimit= You have selected to disable limiting items per group.

ProblemFilterDialog_System_Filters_Title = System filte&rs:

FieldMessage_WrongType = {0} is not of a displayable type

FieldCategory_Uncategorized = Other
ConfigurationEditDialog_title=Edit Configuration
ConfigurationEditDialog_message=Enter the details of the configuration
Category_Label = {0} ({1} items)
Category_One_Item_Label = {0} (1 item)
Category_Limit_Label = {0} ({1} of {2} items)

Return to bug 231081

Lines 352-362 Link Here

(-)src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java (-3 / +3 lines)
352	.getConfigurationElement().getAttribute(	352	.getConfigurationElement().getAttribute(
353	MarkerSupportInternalUtilities.ATTRIBUTE_ID));	353	MarkerSupportInternalUtilities.ATTRIBUTE_ID));
354	// Make sure we get a useful value	354	// Make sure we get a useful value
355	if (value != null && value.intValue() > 0)	355	if (value != null && value.intValue() >= 0)
356	preferredWidth = value.intValue();	356	preferredWidth = value.intValue();
357	}	357	}
358	}	358	}
359	if (preferredWidth <= 0) {	359	if (preferredWidth < 0) {
360	// Compute and store a font metric	360	// Compute and store a font metric
361	GC gc = new GC(tree);	361	GC gc = new GC(tree);
362	gc.setFont(tree.getFont());	362	gc.setFont(tree.getFont());
Lines 1245-1251 Link Here
1245	fields[positions[i]] = (MarkerField) column.getData(MARKER_FIELD);	1245	fields[positions[i]] = (MarkerField) column.getData(MARKER_FIELD);
1246	}	1246	}
1247	if (generator != null) {	1247	if (generator != null) {
1248	generator.saveSate(memento, fields);	1248	generator.saveState(memento, fields);
1249	}	1249	}
1250	builder.saveState(memento);	1250	builder.saveState(memento);
1251	}	1251	}

Added Link Here

(-)src/org/eclipse/ui/internal/views/markers/ConfigurationEditDialog.java (+237 lines)
1	/*******************************************************************************
2	* Copyright (c) 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	******************************************************************************/
11
12	package org.eclipse.ui.internal.views.markers;
13
14	import java.util.Collection;
15	import java.util.Iterator;
16
17	import org.eclipse.jface.dialogs.IDialogConstants;
18	import org.eclipse.jface.dialogs.TitleAreaDialog;
19	import org.eclipse.osgi.util.NLS;
20	import org.eclipse.swt.SWT;
21	import org.eclipse.swt.events.DisposeEvent;
22	import org.eclipse.swt.events.DisposeListener;
23	import org.eclipse.swt.events.ModifyEvent;
24	import org.eclipse.swt.events.ModifyListener;
25	import org.eclipse.swt.layout.GridData;
26	import org.eclipse.swt.layout.GridLayout;
27	import org.eclipse.swt.widgets.Button;
28	import org.eclipse.swt.widgets.Composite;
29	import org.eclipse.swt.widgets.Control;
30	import org.eclipse.swt.widgets.Label;
31	import org.eclipse.swt.widgets.Shell;
32	import org.eclipse.swt.widgets.Text;
33	import org.eclipse.ui.forms.events.ExpansionEvent;
34	import org.eclipse.ui.forms.events.IExpansionListener;
35	import org.eclipse.ui.forms.widgets.ExpandableComposite;
36	import org.eclipse.ui.forms.widgets.FormToolkit;
37	import org.eclipse.ui.forms.widgets.ScrolledForm;
38	import org.eclipse.ui.views.markers.FilterConfigurationArea;
39	import org.eclipse.ui.views.markers.internal.MarkerMessages;
40
41	/**
42	* @since 3.7
43	*
44	*/
45	public class ConfigurationEditDialog extends TitleAreaDialog {
46
47	private final MarkerContentGenerator generator;
48	private ScrolledForm form;
49	private Collection configAreas;
50	private GroupFilterConfigurationArea scopeArea = new ScopeArea();
51	private final MarkerFieldFilterGroup filterGroup;
52	private Text nameText;
53	private Collection currentConfigurationNames;
54
55	/**
56	* @param parentShell
57	*/
58	protected ConfigurationEditDialog(Shell parentShell, MarkerContentGenerator generator, MarkerFieldFilterGroup markerFieldFilterGroup) {
59	super(parentShell);
60	this.generator = generator;
61	this.filterGroup = markerFieldFilterGroup;
62	setHelpAvailable(false);
63	}
64
65	protected int getShellStyle() {
66	return super.getShellStyle() \| SWT.RESIZE;
67	}
68
69	/*
70	* (non-Javadoc)
71	* @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
72	*
73	*/
74	protected Control createDialogArea(Composite parent) {
75	Composite container = (Composite) super.createDialogArea(parent);
76
77	Composite composite = new Composite(container, SWT.NONE);
78	composite.setLayout(new GridLayout());
79	composite.setLayoutData(new GridData(GridData.FILL_BOTH));
80
81	Composite nameComposite = new Composite(composite, SWT.NONE);
82	nameComposite.setLayout(new GridLayout(2, false));
83	nameComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
84
85	Label label = new Label(nameComposite, SWT.NONE);
86	label.setText(MarkerMessages.configEditDialog_name);
87	nameText = new Text(nameComposite, SWT.BORDER);
88	nameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
89	nameText.addModifyListener(new ModifyListener() {
90
91	public void modifyText(ModifyEvent e) {
92	validate();
93	}
94	});
95
96	final FormToolkit toolkit = new FormToolkit(composite.getDisplay());
97	composite.addDisposeListener(new DisposeListener() {
98	public void widgetDisposed(DisposeEvent e) {
99	toolkit.dispose();
100	}
101	});
102	form = toolkit.createScrolledForm(composite);
103	form.setBackground(composite.getBackground());
104
105	form.getBody().setLayout(new GridLayout());
106
107	configAreas = generator.createFilterConfigurationFields();
108
109	createFieldArea(toolkit, form, scopeArea, true);
110	Iterator areas = configAreas.iterator();
111	while (areas.hasNext()) {
112	createFieldArea(toolkit, form,
113	(FilterConfigurationArea) areas.next(), true);
114	}
115
116	initUI();
117
118	return container;
119	}
120
121	private void initUI() {
122
123	setTitle(MarkerMessages.ConfigurationEditDialog_title);
124	setMessage(MarkerMessages.ConfigurationEditDialog_message);
125
126	nameText.setText(filterGroup.getName());
127	scopeArea.initializeFromGroup(filterGroup);
128	Iterator areas = configAreas.iterator();
129	while (areas.hasNext()) {
130	FilterConfigurationArea area = (FilterConfigurationArea) areas
131	.next();
132	if (area instanceof GroupFilterConfigurationArea)
133	((GroupFilterConfigurationArea) area)
134	.initializeFromGroup(filterGroup);
135	area.initialize(filterGroup.getFilter(area.getField()));
136	}
137	}
138
139	/**
140	* Create a field area in the form for the FilterConfigurationArea
141	*
142	* @param toolkit
143	* @param form
144	* @param area
145	* @param expand
146	* <code>true</code> if the area should be expanded by default
147	*/
148	private void createFieldArea(final FormToolkit toolkit,
149	final ScrolledForm form, final FilterConfigurationArea area,
150	boolean expand) {
151	final ExpandableComposite expandable = toolkit
152	.createExpandableComposite(form.getBody(),
153	ExpandableComposite.TWISTIE);
154	expandable.setText(area.getTitle());
155	expandable.setBackground(form.getBackground());
156	expandable.setLayout(new GridLayout());
157	expandable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, area
158	.grabExcessVerticalSpace()));
159	expandable.addExpansionListener(new IExpansionListener() {
160	/*
161	* (non-Javadoc)
162	*
163	* @see
164	* org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanged
165	* (org.eclipse.ui.forms.events.ExpansionEvent)
166	*/
167	public void expansionStateChanged(ExpansionEvent e) {
168	expandable.getParent().layout(true);
169
170	}
171
172	/*
173	* (non-Javadoc)
174	*
175	* @see
176	* org.eclipse.ui.forms.events.IExpansionListener#expansionStateChanging
177	* (org.eclipse.ui.forms.events.ExpansionEvent)
178	*/
179	public void expansionStateChanging(ExpansionEvent e) {
180
181	}
182	});
183
184	Composite sectionClient = toolkit.createComposite(expandable);
185	sectionClient.setLayout(new GridLayout());
186	sectionClient.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true,
187	false));
188	sectionClient.setBackground(form.getBackground());
189	area.createContents(sectionClient);
190	expandable.setClient(sectionClient);
191	expandable.setExpanded(expand);
192	}
193
194	/* (non-Javadoc)
195	* @see org.eclipse.jface.dialogs.Dialog#okPressed()
196	*/
197	protected void okPressed() {
198	applyValues();
199	super.okPressed();
200	}
201
202	private void applyValues() {
203	scopeArea.applyToGroup(filterGroup);
204	Iterator areas = configAreas.iterator();
205	while (areas.hasNext()) {
206	FilterConfigurationArea area = (FilterConfigurationArea) areas
207	.next();
208
209	// Handle the internal special cases
210	if (area instanceof GroupFilterConfigurationArea)
211	((GroupFilterConfigurationArea) area)
212	.applyToGroup(filterGroup);
213	area.apply(filterGroup.getFilter(area.getField()));
214	}
215	}
216
217	private void validate() {
218	Button okButton = getButton(IDialogConstants.OK_ID);
219	if(okButton == null)
220	return;
221	String name = nameText.getText();
222	if(currentConfigurationNames.contains(name) && !filterGroup.getName().equals(name)) {
223	String message = NLS.bind(MarkerMessages.filtersDialog_conflictingName, name);
224	setErrorMessage(message);
225	okButton.setEnabled(false);
226	}else {
227	setErrorMessage(null);
228	okButton.setEnabled(true);
229	}
230	}
231
232	public void setCurrentConfigurationNames(
233	Collection currentConfigurationNames) {
234	this.currentConfigurationNames = currentConfigurationNames;
235	}
236
237	}

Lines 67-72 Link Here

(-)src/org/eclipse/ui/internal/views/markers/MarkerContentGenerator.java (-37 / +59 lines)
67	private static final String TAG_GROUP_ENTRY = "filterGroup"; //$NON-NLS-1$	67	private static final String TAG_GROUP_ENTRY = "filterGroup"; //$NON-NLS-1$
68	private static final String TAG_AND = "andFilters"; //$NON-NLS-1$	68	private static final String TAG_AND = "andFilters"; //$NON-NLS-1$
69	private static final String TAG_LEGACY_FILTER_ENTRY = "filter"; //$NON-NLS-1$	69	private static final String TAG_LEGACY_FILTER_ENTRY = "filter"; //$NON-NLS-1$
		70	private static final String TAG_MARKER_LIMIT = "markerLimit"; //$NON-NLS-1$
70		71
71	/Use this to indicate filter change rather than a null/	72	/Use this to indicate filter change rather than a null/
72	private final Collection FILTERS_CHANGED = Collections.EMPTY_SET;	73	private final Collection FILTERS_CHANGED = Collections.EMPTY_SET;
Lines 81-86 Link Here
81	private Collection enabledFilters;	82	private Collection enabledFilters;
82	private Collection filters;	83	private Collection filters;
83	private boolean andFilters = false;	84	private boolean andFilters = false;
		85	private int markerLimits = 100;
84		86
85	/**	87	/**
86	* focusResources	88	* focusResources
Lines 199-209 Link Here
199	return hidden.toArray();	201	return hidden.toArray();
200	}	202	}
201		203
202	void initialise(IMemento memento) {	204	void saveState(IMemento memento, MarkerField[] displayedFields) {
203	initialiseVisibleFields(memento);	205
204	}	206	memento.putInteger(TAG_MARKER_LIMIT, markerLimits);
205		207
206	void saveSate(IMemento memento, MarkerField[] displayedFields) {
207	for (int i = 0; i < displayedFields.length; i++) {	208	for (int i = 0; i < displayedFields.length; i++) {
208	memento.createChild(TAG_COLUMN_VISIBILITY, displayedFields[i]	209	memento.createChild(TAG_COLUMN_VISIBILITY, displayedFields[i]
209	.getConfigurationElement().getAttribute(	210	.getConfigurationElement().getAttribute(
Lines 212-259 Link Here
212	}	213	}
213		214
214	void restoreState(IMemento memento) {	215	void restoreState(IMemento memento) {
215	initialiseVisibleFields(memento);
216	}
217
218	/**
219	* Initialize the visible fields based on the initial settings or the
220	* contents of the {@link IMemento}
221	*
222	* @param memento
223	* IMemento
224	*/
225	private void initialiseVisibleFields(IMemento memento) {
226		216
227	if (memento == null	217	initDefaults();
228	\|\| memento.getChildren(TAG_COLUMN_VISIBILITY).length == 0) {
229	MarkerField[] initialFields = getInitialVisible();
230		218
231	visibleFields = new MarkerField[initialFields.length];	219	if (memento == null) {
232	System.arraycopy(initialFields, 0, visibleFields, 0,
233	initialFields.length);
234	return;	220	return;
235	}	221	}
236		222
237	IMemento[] visible = memento.getChildren(TAG_COLUMN_VISIBILITY);	223	Integer limits = memento.getInteger(TAG_MARKER_LIMIT);
238	Collection newVisible = new ArrayList();	224	if(limits != null) {
239		225	markerLimits = limits.intValue();
240	MarkerField[] all = getAllFields();
241	Hashtable allTable = new Hashtable();
242
243	for (int i = 0; i < all.length; i++) {
244	allTable.put(all[i].getConfigurationElement().getAttribute(
245	MarkerSupportInternalUtilities.ATTRIBUTE_ID), all[i]);
246	}	226	}
		227
		228	if (memento.getChildren(TAG_COLUMN_VISIBILITY).length != 0) {
247		229
248	for (int i = 0; i < visible.length; i++) {	230	IMemento[] visible = memento.getChildren(TAG_COLUMN_VISIBILITY);
249	String key = visible[i].getID();	231	Collection newVisible = new ArrayList();
250	if (allTable.containsKey(key)) {	232
251	newVisible.add(allTable.get(key));	233	MarkerField[] all = getAllFields();
		234	Hashtable allTable = new Hashtable();
		235
		236	for (int i = 0; i < all.length; i++) {
		237	allTable.put(all[i].getConfigurationElement().getAttribute(
		238	MarkerSupportInternalUtilities.ATTRIBUTE_ID), all[i]);
252	}	239	}
		240
		241	for (int i = 0; i < visible.length; i++) {
		242	String key = visible[i].getID();
		243	if (allTable.containsKey(key)) {
		244	newVisible.add(allTable.get(key));
		245	}
		246	}
		247
		248	visibleFields = new MarkerField[newVisible.size()];
		249	newVisible.toArray(visibleFields);
253	}	250	}
		251	}
		252
		253	private void initDefaults() {
		254
		255	IPreferenceStore preferenceStore = IDEWorkbenchPlugin.getDefault().getPreferenceStore();
		256	if(preferenceStore.getBoolean(IDEInternalPreferences.USE_MARKER_LIMITS))
		257	markerLimits = preferenceStore.getInt(IDEInternalPreferences.MARKER_LIMITS_VALUE);
		258
		259	MarkerField[] initialFields = getInitialVisible();
		260
		261	visibleFields = new MarkerField[initialFields.length];
		262	System.arraycopy(initialFields, 0, visibleFields, 0,
		263	initialFields.length);
254		264
255	visibleFields = new MarkerField[newVisible.size()];
256	newVisible.toArray(visibleFields);
257	}	265	}
258		266
259	/**	267	/**
Lines 390-395 Link Here
390	boolean andFilters() {	398	boolean andFilters() {
391	return andFilters;	399	return andFilters;
392	}	400	}
		401
		402	/**
		403	* @return Returns the markerLimits.
		404	*/
		405	public int getMarkerLimits() {
		406	return markerLimits;
		407	}
		408
		409	/**
		410	* @param markerLimits The markerLimits to set.
		411	*/
		412	public void setMarkerLimits(int markerLimits) {
		413	this.markerLimits = markerLimits;
		414	}
393		415
394	/**	416	/**
395	* @return Collection of declared MarkerFieldFilterGroup(s)	417	* @return Collection of declared MarkerFieldFilterGroup(s)

Lines 20-35 Link Here

(-)src/org/eclipse/ui/internal/views/markers/ViewerColumnsDialog.java (-161 / +81 lines)
20		20
21	import org.eclipse.core.runtime.IStatus;	21	import org.eclipse.core.runtime.IStatus;
22	import org.eclipse.jface.resource.JFaceResources;	22	import org.eclipse.jface.resource.JFaceResources;
		23	import org.eclipse.jface.viewers.ArrayContentProvider;
23	import org.eclipse.jface.viewers.ISelection;	24	import org.eclipse.jface.viewers.ISelection;
24	import org.eclipse.jface.viewers.ISelectionChangedListener;	25	import org.eclipse.jface.viewers.ISelectionChangedListener;
25	import org.eclipse.jface.viewers.IStructuredContentProvider;
26	import org.eclipse.jface.viewers.IStructuredSelection;	26	import org.eclipse.jface.viewers.IStructuredSelection;
27	import org.eclipse.jface.viewers.ITableLabelProvider;	27	import org.eclipse.jface.viewers.ITableLabelProvider;
28	import org.eclipse.jface.viewers.LabelProvider;	28	import org.eclipse.jface.viewers.LabelProvider;
29	import org.eclipse.jface.viewers.SelectionChangedEvent;	29	import org.eclipse.jface.viewers.SelectionChangedEvent;
30	import org.eclipse.jface.viewers.TableViewer;	30	import org.eclipse.jface.viewers.TableViewer;
31	import org.eclipse.jface.viewers.Viewer;
32	import org.eclipse.swt.SWT;	31	import org.eclipse.swt.SWT;
		32	import org.eclipse.swt.events.FocusAdapter;
		33	import org.eclipse.swt.events.FocusEvent;
33	import org.eclipse.swt.graphics.Image;	34	import org.eclipse.swt.graphics.Image;
34	import org.eclipse.swt.layout.FillLayout;	35	import org.eclipse.swt.layout.FillLayout;
35	import org.eclipse.swt.layout.GridData;	36	import org.eclipse.swt.layout.GridData;
Lines 39-51 Link Here
39	import org.eclipse.swt.widgets.Control;	40	import org.eclipse.swt.widgets.Control;
40	import org.eclipse.swt.widgets.Display;	41	import org.eclipse.swt.widgets.Display;
41	import org.eclipse.swt.widgets.Event;	42	import org.eclipse.swt.widgets.Event;
42	import org.eclipse.swt.widgets.Group;
43	import org.eclipse.swt.widgets.Label;	43	import org.eclipse.swt.widgets.Label;
44	import org.eclipse.swt.widgets.Listener;	44	import org.eclipse.swt.widgets.Listener;
45	import org.eclipse.swt.widgets.Shell;	45	import org.eclipse.swt.widgets.Shell;
		46	import org.eclipse.swt.widgets.Spinner;
46	import org.eclipse.swt.widgets.Table;	47	import org.eclipse.swt.widgets.Table;
47	import org.eclipse.swt.widgets.TableColumn;	48	import org.eclipse.swt.widgets.TableColumn;
48	import org.eclipse.swt.widgets.Text;
49	import org.eclipse.ui.views.markers.internal.MarkerMessages;	49	import org.eclipse.ui.views.markers.internal.MarkerMessages;
50		50
51	/**	51	/**
Lines 75-94 Link Here
75		75
76	private Button toVisibleBtt, toNonVisibleBtt;	76	private Button toVisibleBtt, toNonVisibleBtt;
77		77
78	private Text widthText;	78	private Spinner widthSpinner;
79
80	/**
81	* A listener to validate positive integer numbers only
82	*/
83	Listener postiveIntTextListener = new Listener() {
84	private String intialValue;
85
86	public void handleEvent(Event event) {
87	intialValue = intialValue != null ? intialValue : Integer
88	.toString(0);
89	intialValue = handleIntegerFieldChange(event, intialValue);
90	}
91	};
92		79
93	/**	80	/**
94	* Create a new instance of the receiver.	81	* Create a new instance of the receiver.
Lines 130-159 Link Here
130	* @see org.eclipse.ui.internal.views.markers.ViewerSettingsAndStatusDialog#createDialogContentArea(org.eclipse.swt.widgets.Composite)	117	* @see org.eclipse.ui.internal.views.markers.ViewerSettingsAndStatusDialog#createDialogContentArea(org.eclipse.swt.widgets.Composite)
131	*/	118	*/
132	protected Control createDialogContentArea(Composite dialogArea) {	119	protected Control createDialogContentArea(Composite dialogArea) {
133	return createColumnsArea(dialogArea);	120	Composite composite = new Composite(dialogArea, SWT.NONE);
		121	composite.setLayout(new GridLayout(4, false));
		122	composite.setLayoutData(new GridData(GridData.FILL_BOTH));
		123
		124	createInvisibleTable(composite);
		125	createMoveButtons(composite);
		126	createVisibleTable(composite);
		127	createUpDownBtt(composite);
		128	createWidthArea(composite);
		129	return composite;
134	}	130	}
135		131
136	/**
137	* Create the controls to configure columns.
138	*
139	* @param dialogArea
140	* @return {@link Control}
141	*/
142	Control createColumnsArea(Composite dialogArea) {
143	Group columnArea = new Group(dialogArea, SWT.NONE);
144	columnArea.setLayout(new GridLayout(4, false));
145	GridData gData = new GridData(GridData.FILL_BOTH
146	\| GridData.GRAB_HORIZONTAL \| GridData.GRAB_VERTICAL);
147	columnArea.setLayoutData(gData);
148	columnArea.setText(MarkerMessages.MarkerPreferences_ColumnGroupTitle);
149
150	createInvisibleTable(columnArea);
151	createMoveButtons(columnArea);
152	createVisibleTable(columnArea);
153	createUpDownBtt(columnArea);
154	createWidthArea(columnArea);
155	return columnArea;
156	}
157		132
158	/**	133	/**
159	* The Up and Down button to change column ordering.	134	* The Up and Down button to change column ordering.
Lines 163-175 Link Here
163	Control createUpDownBtt(Composite parent) {	138	Control createUpDownBtt(Composite parent) {
164	Composite composite = new Composite(parent, SWT.NONE);	139	Composite composite = new Composite(parent, SWT.NONE);
165	GridLayout layout = new GridLayout(1, true);	140	GridLayout layout = new GridLayout(1, true);
166	layout.horizontalSpacing = 0;
167	layout.marginRight = -1;
168	layout.marginLeft = -1;
169	layout.marginWidth = 0;
170	composite.setLayout(layout);	141	composite.setLayout(layout);
171	composite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL	142	GridData gridData = new GridData(GridData.FILL_VERTICAL);
172	\| GridData.VERTICAL_ALIGN_END));	143	gridData.verticalIndent = convertHeightInCharsToPixels(1);
		144	composite.setLayoutData(gridData);
173	upButton = new Button(composite, SWT.PUSH);	145	upButton = new Button(composite, SWT.PUSH);
174	upButton.setText(JFaceResources.getString("ConfigureColumnsDialog_up")); //$NON-NLS-1$	146	upButton.setText(JFaceResources.getString("ConfigureColumnsDialog_up")); //$NON-NLS-1$
175	upButton.addListener(SWT.Selection, new Listener() {	147	upButton.addListener(SWT.Selection, new Listener() {
Lines 177-183 Link Here
177	handleUpButton(event);	149	handleUpButton(event);
178	}	150	}
179	});	151	});
180	upButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	152	setButtonLayoutData(upButton);
181	upButton.setEnabled(false);	153	upButton.setEnabled(false);
182		154
183	downButton = new Button(composite, SWT.PUSH);	155	downButton = new Button(composite, SWT.PUSH);
Lines 188-194 Link Here
188	handleDownButton(event);	160	handleDownButton(event);
189	}	161	}
190	});	162	});
191	downButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	163	setButtonLayoutData(downButton);
192	downButton.setEnabled(false);	164	downButton.setEnabled(false);
193	return composite;	165	return composite;
194	}	166	}
Lines 208-253 Link Here
208	gridData.horizontalSpan = 3;	180	gridData.horizontalSpan = 3;
209	widthLabel.setLayoutData(gridData);	181	widthLabel.setLayoutData(gridData);
210		182
211	widthText = new Text(parent, SWT.SINGLE \| SWT.BORDER);	183	widthSpinner = new Spinner(parent, SWT.BORDER);
212	widthText.setText(Integer.toString(0));	184	widthSpinner.setMinimum(1);
213	gridData = new GridData(GridData.FILL_HORIZONTAL	185	widthSpinner.setSelection(1);
214	\| GridData.HORIZONTAL_ALIGN_CENTER);	186	widthSpinner.setMaximum(10000);
215	gridData.widthHint = convertWidthInCharsToPixels(5);	187	gridData = new GridData();
216	widthText.setLayoutData(gridData);	188	gridData.minimumWidth = convertWidthInCharsToPixels(5);
217	widthText.addListener(SWT.Modify, postiveIntTextListener);	189	widthSpinner.setLayoutData(gridData);
218	widthText.addListener(SWT.Modify, new Listener() {	190	widthSpinner.addFocusListener(new FocusAdapter() {
219	public void handleEvent(Event event) {	191	public void focusLost(FocusEvent e) {
220	if (widthText.isEnabled()) {	192	Object data = ((IStructuredSelection) visibleViewer
221	try {	193	.getSelection()).getFirstElement();
222	int width = Integer	194	if (data != null) {
223	.parseInt(widthText.getText().trim());	195	IColumnUpdater updater = getColumnUpdater();
224	Object data = ((IStructuredSelection) visibleViewer	196	updater.setColumnWidth(data, widthSpinner.getSelection());
225	.getSelection()).getFirstElement();
226	if (data != null) {
227	IColumnUpdater updater = getColumnUpdater();
228	updater.setColumnWidth(data, width);
229	}
230	} catch (Exception e) {
231	return;// ignore
232	}
233	}	197	}
234	}	198	}
235	});	199	});
236	widthText.setText(MarkerSupportInternalUtilities.EMPTY_STRING);	200	widthSpinner.setEnabled(false);
237	widthText.setEditable(false);	201	return widthSpinner;
238	return widthText;
239	}
240
241	/**
242	* Adapter to {@link IStructuredContentProvider}
243	*/
244	abstract class ContentProviderAdapter implements IStructuredContentProvider {
245
246	public void dispose() {
247	}
248
249	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
250	}
251	}	202	}
252		203
253	/**	204	/**
Lines 257-268 Link Here
257	* @return {@link Control}	208	* @return {@link Control}
258	*/	209	*/
259	Control createVisibleTable(Composite parent) {	210	Control createVisibleTable(Composite parent) {
260	final Table table = new Table(parent, SWT.BORDER \| SWT.MULTI);	211
		212	Composite composite = new Composite(parent, SWT.NONE);
		213	composite.setLayout(new GridLayout(1, false));
		214	composite.setLayoutData(new GridData(GridData.FILL_BOTH));
		215
		216	Label label = new Label(composite, SWT.NONE);
		217	label.setText(MarkerMessages.MarkerPreferences_VisibleColumnsTitle);
		218
		219	final Table table = new Table(composite, SWT.BORDER \| SWT.MULTI);
261	GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);	220	GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
262	data.widthHint = convertWidthInCharsToPixels(30);	221	data.widthHint = convertWidthInCharsToPixels(20);
263	data.heightHint = table.getItemHeight() * 15;	222	data.heightHint = table.getItemHeight() * 15;
264	table.setLayoutData(data);	223	table.setLayoutData(data);
265	table.setHeaderVisible(true);
266		224
267	final TableColumn column = new TableColumn(table, SWT.NONE);	225	final TableColumn column = new TableColumn(table, SWT.NONE);
268	column.setText(MarkerMessages.MarkerPreferences_VisibleColumnsTitle);	226	column.setText(MarkerMessages.MarkerPreferences_VisibleColumnsTitle);
Lines 275-285 Link Here
275		233
276	visibleViewer = new TableViewer(table);	234	visibleViewer = new TableViewer(table);
277	visibleViewer.setLabelProvider(doGetLabelProvider());	235	visibleViewer.setLabelProvider(doGetLabelProvider());
278	visibleViewer.setContentProvider(new ContentProviderAdapter() {	236	visibleViewer.setContentProvider(ArrayContentProvider.getInstance());
279	public Object[] getElements(Object inputElement) {
280	return getVisible().toArray();
281	}
282	});
283	visibleViewer	237	visibleViewer
284	.addSelectionChangedListener(new ISelectionChangedListener() {	238	.addSelectionChangedListener(new ISelectionChangedListener() {
285	public void selectionChanged(SelectionChangedEvent event) {	239	public void selectionChanged(SelectionChangedEvent event) {
Lines 291-297 Link Here
291	handleToNonVisibleButton(event);	245	handleToNonVisibleButton(event);
292	}	246	}
293	});	247	});
294	visibleViewer.setInput(this);	248	visibleViewer.setInput(getVisible());
295	return table;	249	return table;
296	}	250	}
297		251
Lines 302-313 Link Here
302	* @return {@link Control}	256	* @return {@link Control}
303	*/	257	*/
304	Control createInvisibleTable(Composite parent) {	258	Control createInvisibleTable(Composite parent) {
305	final Table table = new Table(parent, SWT.BORDER \| SWT.MULTI);	259
		260	Composite composite = new Composite(parent, SWT.NONE);
		261	composite.setLayout(new GridLayout(1, false));
		262	composite.setLayoutData(new GridData(GridData.FILL_BOTH));
		263
		264	Label label = new Label(composite, SWT.NONE);
		265	label.setText(MarkerMessages.MarkerPreferences_HiddenColumnsTitle);
		266
		267	final Table table = new Table(composite, SWT.BORDER \| SWT.MULTI);
306	GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);	268	GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
307	data.widthHint = convertWidthInCharsToPixels(30);	269	data.widthHint = convertWidthInCharsToPixels(20);
308	data.heightHint = table.getItemHeight() * 15;	270	data.heightHint = table.getItemHeight() * 15;
309	table.setLayoutData(data);	271	table.setLayoutData(data);
310	table.setHeaderVisible(true);
311		272
312	final TableColumn column = new TableColumn(table, SWT.NONE);	273	final TableColumn column = new TableColumn(table, SWT.NONE);
313	column.setText(MarkerMessages.MarkerPreferences_HiddenColumnsTitle);	274	column.setText(MarkerMessages.MarkerPreferences_HiddenColumnsTitle);
Lines 320-330 Link Here
320		281
321	nonVisibleViewer = new TableViewer(table);	282	nonVisibleViewer = new TableViewer(table);
322	nonVisibleViewer.setLabelProvider(doGetLabelProvider());	283	nonVisibleViewer.setLabelProvider(doGetLabelProvider());
323	nonVisibleViewer.setContentProvider(new ContentProviderAdapter() {	284	nonVisibleViewer.setContentProvider(ArrayContentProvider.getInstance());
324	public Object[] getElements(Object inputElement) {
325	return getNonVisible().toArray();
326	}
327	});
328	nonVisibleViewer	285	nonVisibleViewer
329	.addSelectionChangedListener(new ISelectionChangedListener() {	286	.addSelectionChangedListener(new ISelectionChangedListener() {
330	public void selectionChanged(SelectionChangedEvent event) {	287	public void selectionChanged(SelectionChangedEvent event) {
Lines 336-342 Link Here
336	handleToVisibleButton(event);	293	handleToVisibleButton(event);
337	}	294	}
338	});	295	});
339	nonVisibleViewer.setInput(this);	296	nonVisibleViewer.setInput(getNonVisible());
340	return table;	297	return table;
341	}	298	}
342		299
Lines 350-362 Link Here
350	Control createMoveButtons(Composite parent) {	307	Control createMoveButtons(Composite parent) {
351	Composite bttArea = new Composite(parent, SWT.NONE);	308	Composite bttArea = new Composite(parent, SWT.NONE);
352	bttArea.setLayout(new GridLayout(1, true));	309	bttArea.setLayout(new GridLayout(1, true));
353	bttArea.setLayoutData(new GridData(GridData.FILL_VERTICAL));	310	GridData gridData = new GridData(GridData.FILL_VERTICAL);
		311	gridData.verticalIndent = convertHeightInCharsToPixels(1);
		312	bttArea.setLayoutData(gridData);
		313
		314	toVisibleBtt = new Button(bttArea, SWT.PUSH);
		315	toVisibleBtt
		316	.setText(getDefaultOrientation() == SWT.RIGHT_TO_LEFT ? MarkerMessages.MarkerPreferences_MoveLeft
		317	: MarkerMessages.MarkerPreferences_MoveRight);
		318	setButtonLayoutData(toVisibleBtt);
		319	toVisibleBtt.addListener(SWT.Selection, new Listener() {
		320	public void handleEvent(Event event) {
		321	handleToVisibleButton(event);
		322	}
		323	});
		324	toVisibleBtt.setEnabled(false);
354		325
355	toNonVisibleBtt = new Button(bttArea, SWT.PUSH);	326	toNonVisibleBtt = new Button(bttArea, SWT.PUSH);
356	toNonVisibleBtt	327	toNonVisibleBtt
357	.setText(getDefaultOrientation() == SWT.RIGHT_TO_LEFT ? MarkerMessages.MarkerPreferences_MoveRight	328	.setText(getDefaultOrientation() == SWT.RIGHT_TO_LEFT ? MarkerMessages.MarkerPreferences_MoveRight
358	: MarkerMessages.MarkerPreferences_MoveLeft);	329	: MarkerMessages.MarkerPreferences_MoveLeft);
359	toNonVisibleBtt.setLayoutData(new GridData());	330	setButtonLayoutData(toNonVisibleBtt);
360		331
361	toNonVisibleBtt.addListener(SWT.Selection, new Listener() {	332	toNonVisibleBtt.addListener(SWT.Selection, new Listener() {
362	public void handleEvent(Event event) {	333	public void handleEvent(Event event) {
Lines 365-424 Link Here
365	});	336	});
366	toNonVisibleBtt.setEnabled(false);	337	toNonVisibleBtt.setEnabled(false);
367		338
368	toVisibleBtt = new Button(bttArea, SWT.PUSH);
369	toVisibleBtt
370	.setText(getDefaultOrientation() == SWT.RIGHT_TO_LEFT ? MarkerMessages.MarkerPreferences_MoveLeft
371	: MarkerMessages.MarkerPreferences_MoveRight);
372	toVisibleBtt.setLayoutData(new GridData());
373	toVisibleBtt.addListener(SWT.Selection, new Listener() {
374	public void handleEvent(Event event) {
375	handleToVisibleButton(event);
376	}
377	});
378	toVisibleBtt.setEnabled(false);
379	return bttArea;	339	return bttArea;
380	}	340	}
381		341
382	/**	342	/**
383	*
384	* @param event
385	* @param intialvalue
386	* @return new value in String
387	*/
388	String handleIntegerFieldChange(Event event, String intialvalue) {
389	String value = ((Text) event.widget).getText().trim();
390	boolean editable = ((Text) event.widget).getEditable();
391	switch (event.type) {
392	case SWT.KeyDown:
393	case SWT.Modify:
394	case SWT.FocusOut:
395	if (!editable) {
396	handleStatusUdpate(IStatus.INFO, null);
397	break;
398	}
399	if (value.length() == 0) {
400	handleStatusUdpate(IStatus.ERROR, null);
401	} else {
402	try {
403	int number = Integer.parseInt(value);
404	if (number > 0) {
405	handleStatusUdpate(IStatus.INFO, null);
406	} else {
407	value = intialvalue;
408	((Text) event.widget).selectAll();
409	handleStatusUdpate(IStatus.ERROR, getErrorMessage());
410	}
411	} catch (Exception e) {
412	value = intialvalue;
413	((Text) event.widget).selectAll();
414	handleStatusUdpate(IStatus.ERROR, getErrorMessage());
415	}
416	}
417	}
418	return value;
419	}
420
421	/**
422	* Handles a selection change in the viewer that lists out the non-visible	343	* Handles a selection change in the viewer that lists out the non-visible
423	* columns	344	* columns
424	*	345	*
Lines 427-433 Link Here
427	void handleNonVisibleSelection(ISelection selection) {	348	void handleNonVisibleSelection(ISelection selection) {
428	Object[] nvKeys = ((IStructuredSelection) selection).toArray();	349	Object[] nvKeys = ((IStructuredSelection) selection).toArray();
429	toVisibleBtt.setEnabled(nvKeys.length > 0);	350	toVisibleBtt.setEnabled(nvKeys.length > 0);
430		351	widthSpinner.setEnabled(false);
431	if (visibleViewer.getControl().isFocusControl()	352	if (visibleViewer.getControl().isFocusControl()
432	&& getVisible().size() <= 1) {	353	&& getVisible().size() <= 1) {
433	handleStatusUdpate(IStatus.INFO,	354	handleStatusUdpate(IStatus.INFO,
Lines 478-489 Link Here
478		399
479	boolean edit = selVCols.size() == 1 ? infoProvider	400	boolean edit = selVCols.size() == 1 ? infoProvider
480	.isColumnResizable(selVCols.get(0)) : false;	401	.isColumnResizable(selVCols.get(0)) : false;
481	widthText.setEditable(edit);	402	widthSpinner.setEnabled(edit);
482	if (edit) {	403	if (edit) {
483	widthText.setText(Integer.toString(infoProvider	404	widthSpinner.setSelection(infoProvider
484	.getColumnWidth(selVCols.get(0))));	405	.getColumnWidth(selVCols.get(0)));
485	} else {	406	} else {
486	widthText.setText(MarkerSupportInternalUtilities.EMPTY_STRING);	407	widthSpinner.setSelection(0);
487	}	408	}
488	}	409	}
489		410
Lines 1005-1009 Link Here
1005		926
1006	}	927	}
1007		928
1008	// //////////////////////////////////////////////////////////////////////////////////
1009	}	929	}

Lines 76-81 Link Here

(-)src/org/eclipse/ui/views/markers/internal/MarkerMessages.java (-3 / +7 lines)
76	public static String filtersDialog_title;	76	public static String filtersDialog_title;
77	public static String configureFiltersCommand_title;	77	public static String configureFiltersCommand_title;
78	public static String configureFiltersDialog_title;	78	public static String configureFiltersDialog_title;
		79
		80	public static String configEditDialog_name;
79		81
80	public static String filtersDialog_showItemsOfType;	82	public static String filtersDialog_showItemsOfType;
81	public static String filtersDialog_anyResource;	83	public static String filtersDialog_anyResource;
Lines 209-219 Link Here
209	public static String MarkerFilter_filtersTitle;	211	public static String MarkerFilter_filtersTitle;
210	public static String MarkerFilter_addFilterName;	212	public static String MarkerFilter_addFilterName;
211	public static String MarkerFilter_cloneFilterName;	213	public static String MarkerFilter_cloneFilterName;
		214	public static String MarkerFilter_editFilterName;
212	public static String MarkerFilter_deleteSelectedName;	215	public static String MarkerFilter_deleteSelectedName;
213	public static String MarkerFilter_renameName;
214	public static String MarkerFilter_showAllCommand_title;	216	public static String MarkerFilter_showAllCommand_title;
215	public static String MarkerFilter_ConfigureContentsCommand_title;	217	public static String MarkerFilter_ConfigureContentsCommand_title;
216		218
217	public static String MarkerFilterDialog_title;	219	public static String MarkerFilterDialog_title;
218	public static String MarkerFilterDialog_message;	220	public static String MarkerFilterDialog_message;
219	public static String MarkerFilterDialog_emptyMessage;	221	public static String MarkerFilterDialog_emptyMessage;
Lines 250-255 Link Here
250	public static String FieldMessage_NullMessage;	252	public static String FieldMessage_NullMessage;
251	public static String FieldCategory_Uncategorized;	253	public static String FieldCategory_Uncategorized;
252	public static String FieldMessage_WrongType;	254	public static String FieldMessage_WrongType;
		255	public static String ConfigurationEditDialog_title;
		256	public static String ConfigurationEditDialog_message;
253	public static String Category_Label;	257	public static String Category_Label;
254	public static String Category_Limit_Label;	258	public static String Category_Limit_Label;
255	public static String Category_One_Item_Label;	259	public static String Category_One_Item_Label;
Lines 297-303 Link Here
297		301
298	public static String PasteHandler_title;	302	public static String PasteHandler_title;
299		303
300	public static String AND_OR_Label;	304	public static String ALL_Title;
301	public static String AND_Title;	305	public static String AND_Title;
302	public static String OR_Title;	306	public static String OR_Title;
303		307

Lines 60-65 Link Here

(-)src/org/eclipse/ui/views/markers/internal/messages.properties (-11 / +15 lines)
60	deleteActionConfirmTitle = Delete Selected Entries	60	deleteActionConfirmTitle = Delete Selected Entries
61	deleteActionConfirmMessage = Do you want to delete the selected entries? Deleted markers may be recreated by a build or may not be recoverable.	61	deleteActionConfirmMessage = Do you want to delete the selected entries? Deleted markers may be recreated by a build or may not be recoverable.
62		62
		63	configEditDialog_name = &Name:
		64
63	filtersDialog_title = Filters	65	filtersDialog_title = Filters
64	filtersDialog_entriesTitle = &Configurations:	66	filtersDialog_entriesTitle = &Configurations:
65	filtersDialog_showItemsOfType = Show items of &type:	67	filtersDialog_showItemsOfType = Show items of &type:
Lines 185-218 Link Here
185	RemoveMarker_errorTitle=Error	187	RemoveMarker_errorTitle=Error
186		188
187	MarkerFilter_defaultFilterName=Default	189	MarkerFilter_defaultFilterName=Default
188	MarkerFilter_newFilterName=New Filter	190	MarkerFilter_newFilterName=New Configuration
189	MarkerFilter_filtersTitle=User f&ilters:	191	MarkerFilter_filtersTitle=User f&ilters:
190	MarkerFilter_addFilterName=&New...	192	MarkerFilter_addFilterName=&New...
191	MarkerFilter_cloneFilterName=D&uplicate...	193	MarkerFilter_cloneFilterName=D&uplicate...
		194	MarkerFilter_editFilterName=&Edit...
192	MarkerFilter_deleteSelectedName = Remo&ve	195	MarkerFilter_deleteSelectedName = Remo&ve
193	MarkerFilter_renameName = &Rename
194	MarkerFilter_showAllCommand_title = &Show All	196	MarkerFilter_showAllCommand_title = &Show All
195	MarkerFilter_ConfigureContentsCommand_title = &Configure Contents...	197	MarkerFilter_ConfigureContentsCommand_title = &Configure Contents...
196		198
197	MarkerFilterDialog_title=Filter Name	199	MarkerFilterDialog_title=Filter Name
198	MarkerFilterDialog_message=Select a filter name	200	MarkerFilterDialog_message=Select a filter name
199	MarkerFilterDialog_emptyMessage=Name must not be empty	201	MarkerFilterDialog_emptyMessage=Name must not be empty
200	AND_OR_Label=Show results matching:	202	ALL_Title = &Show all items
201	AND_Title = A&ll enabled filters	203	AND_Title = Show items that match a&ll the configurations checked below
202	OR_Title = &Any enabled filter	204	OR_Title = Show items that match a&ny configuration checked below
203		205
204	MarkerFilterDialog_errorTitle = An error has occurred	206	MarkerFilterDialog_errorTitle = An error has occurred
205	MarkerFilterDialog_failedFilterMessage = Could not create filter {0}.	207	MarkerFilterDialog_failedFilterMessage = Could not create filter {0}.
206		208
207	MarkerPreferences_DialogTitle = Preferences	209	MarkerPreferences_DialogTitle = Preferences
208	MarkerPreferences_MarkerLimits = Use marker &limits	210	MarkerPreferences_MarkerLimits = Use item &limits
209	MarkerPreferences_VisibleItems = Limit visible &items per group to:	211	MarkerPreferences_MoveLeft = &Hide <
210	MarkerPreferences_MoveLeft = &<<	212	MarkerPreferences_MoveRight = &Show >
211	MarkerPreferences_MoveRight = &>>
212	MarkerPreferences_ColumnGroupTitle = Hide/Show Columns	213	MarkerPreferences_ColumnGroupTitle = Hide/Show Columns
213	MarkerPreferences_VisibleColumnsTitle = &Show	214	MarkerPreferences_VisibleColumnsTitle = &Shown:
214	MarkerPreferences_HiddenColumnsTitle = &Hide	215	MarkerPreferences_HiddenColumnsTitle = &Hidden:
215	MarkerPreferences_AtLeastOneVisibleColumn = There must be at least one visible column.	216	MarkerPreferences_AtLeastOneVisibleColumn = There must be at least one visible column.
		217	MarkerPreferences_VisibleItems = &Number of items visible per group:
216	MarkerFilterDialog_YouHaveDisabledMarkerLimit= You have selected to disable limiting items per group.	218	MarkerFilterDialog_YouHaveDisabledMarkerLimit= You have selected to disable limiting items per group.
217		219
218	ProblemFilterDialog_System_Filters_Title = System filte&rs:	220	ProblemFilterDialog_System_Filters_Title = System filte&rs:
Lines 235-240 Link Here
235	FieldMessage_WrongType = {0} is not of a displayable type	237	FieldMessage_WrongType = {0} is not of a displayable type
236		238
237	FieldCategory_Uncategorized = Other	239	FieldCategory_Uncategorized = Other
		240	ConfigurationEditDialog_title=Edit Configuration
		241	ConfigurationEditDialog_message=Enter the details of the configuration
238	Category_Label = {0} ({1} items)	242	Category_Label = {0} ({1} items)
239	Category_One_Item_Label = {0} (1 item)	243	Category_One_Item_Label = {0} (1 item)
240	Category_Limit_Label = {0} ({1} of {2} items)	244	Category_Limit_Label = {0} ({1} of {2} items)