Correct API violations
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractParameterAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractParameterAction.java
index d19b75b..dab1427 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractParameterAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractParameterAction.java
@@ -44,12 +44,12 @@
 	{
 		if (this.viewer != null)
 		{
-			this.viewer.removeSelectionChangedListener(this);
+			this.viewer.getViewer().removeSelectionChangedListener(this);
 		}
 		this.viewer = viewer;
 		if (viewer != null)
 		{
-			viewer.addSelectionChangedListener(this);
+			viewer.getViewer().addSelectionChangedListener(this);
 			update();
 		}
 	}
@@ -90,7 +90,7 @@
 
 	protected void update()
 	{
-		selectionChanged((IStructuredSelection) getViewer().getSelection());
+		selectionChanged((IStructuredSelection) getViewer().getViewer().getSelection());
 	}
 
 	protected Shell getShell()
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractStylesheetAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractStylesheetAction.java
index d2d8b61..39ac666 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractStylesheetAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractStylesheetAction.java
@@ -76,12 +76,12 @@
 	{
 		if (this.viewer != null)
 		{
-			this.viewer.removeSelectionChangedListener(this);
+			this.viewer.getViewer().removeSelectionChangedListener(this);
 		}
 		this.viewer = viewer;
 		if (viewer != null)
 		{
-			viewer.addSelectionChangedListener(this);
+			viewer.getViewer().addSelectionChangedListener(this);
 			update();
 		}
 	}
@@ -122,7 +122,7 @@
 
 	protected void update()
 	{
-		selectionChanged((IStructuredSelection) getViewer().getSelection());
+		selectionChanged((IStructuredSelection) getViewer().getViewer().getSelection());
 	}
 
 	protected Shell getShell()
@@ -157,7 +157,7 @@
 
 	protected List<?> getOrderedSelection()
 	{
-		List<?> selection = ((IStructuredSelection) getViewer().getSelection()).toList();
+		List<?> selection = ((IStructuredSelection) getViewer().getViewer().getSelection()).toList();
 		return selection;
 	}
 
@@ -168,7 +168,7 @@
 		// for (int i = 0; i < entries.length; i++) {
 		// list.add(entries[i]);
 		// }
-		LaunchPipeline lp = (LaunchPipeline) getViewer().getInput();
+		LaunchPipeline lp = (LaunchPipeline) getViewer().getViewer().getInput();
 		return lp.getTransformDefs();
 	}
 
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java
index c5aee7d..58a2053 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java
@@ -37,7 +37,7 @@
 	@Override
 	public void run()
 	{
-		IStructuredSelection selection = (IStructuredSelection) getViewer().getSelection();
+		IStructuredSelection selection = (IStructuredSelection) getViewer().getViewer().getSelection();
 		getViewer().removeEntries((LaunchTransform[]) selection.toList().toArray(new LaunchTransform[0]));
 	}
 
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParameterViewer.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParameterViewer.java
index 5ba94db..7927c85 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParameterViewer.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParameterViewer.java
@@ -13,48 +13,34 @@
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.wst.xsl.internal.debug.ui.actions.AbstractStylesheetAction;
 import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
 
-public class ParameterViewer extends TableViewer
+public class ParameterViewer
 {
+	private final TableViewer viewer;
 	private final ListenerList fListeners = new ListenerList();
 
 	public ParameterViewer(Table table)
 	{
-		super(table);
-
-		table.addKeyListener(new KeyAdapter()
-		{
-			@Override
-			public void keyPressed(KeyEvent event)
-			{
-				// TODO - removal
-				// if (updateSelection(AbstractStylesheetAction.REMOVE,
-				// (IStructuredSelection)getSelection()) && event.character ==
-				// SWT.DEL && event.stateMask == 0)
-				// {
-				// List selection = getSelectionFromWidget();
-				// getStylesheetContentProvider().removeEntries((IStylesheetEntry[])selection.toArray(new
-				// IStylesheetEntry[0]));
-				// notifyChanged();
-				// }
-			}
-		});
+		viewer = new TableViewer(table);
+	}
+	
+	public TableViewer getViewer()
+	{
+		return viewer;
 	}
 
 	private ParametersContentProvider getParametersContentProvider()
 	{
-		return (ParametersContentProvider) super.getContentProvider();
+		return (ParametersContentProvider) viewer.getContentProvider();
 	}
 
 	public Shell getShell()
 	{
-		return getControl().getShell();
+		return viewer.getControl().getShell();
 	}
 
 	public boolean isEnabled()
@@ -78,7 +64,7 @@
 
 	public IStructuredSelection getSelectedEntries()
 	{
-		IStructuredSelection selection = (IStructuredSelection) getSelection();
+		IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
 		return selection;
 	}
 
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersBlock.java
index 7d33ad7..fb1fb60 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersBlock.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersBlock.java
@@ -69,16 +69,16 @@
 
 	protected void setTransform(LaunchTransform transform)
 	{
-		parametersViewer.setInput(transform);
+		parametersViewer.getViewer().setInput(transform);
 	}
 
 	protected void updateEnabled()
 	{
 		IStructuredSelection stylesheetSelection = (IStructuredSelection) transformsBlock.getStylesheetViewer().getSelection();
 		boolean enabled = stylesheetSelection.size() == 1;
-		parametersViewer.getTable().setEnabled(enabled);
+		parametersViewer.getViewer().getTable().setEnabled(enabled);
 		addParameterButton.setEnabled(enabled);
-		IStructuredSelection parametersSelection = (IStructuredSelection) parametersViewer.getSelection();
+		IStructuredSelection parametersSelection = (IStructuredSelection) parametersViewer.getViewer().getSelection();
 		removeParameterButton.setEnabled(enabled && !parametersSelection.isEmpty());
 	}
 
@@ -118,8 +118,8 @@
 		column3.setText(Messages.ParametersBlock_2); 
 
 		parametersViewer = new ParameterViewer(fTable);
-		parametersViewer.setLabelProvider(new ParametersLabelProvider());
-		parametersViewer.setContentProvider(new ParametersContentProvider());
+		parametersViewer.getViewer().setLabelProvider(new ParametersLabelProvider());
+		parametersViewer.getViewer().setContentProvider(new ParametersContentProvider());
 		parametersViewer.addParametersChangedListener(new IParametersChangedListener()
 		{
 
@@ -128,7 +128,7 @@
 				updateLaunchConfigurationDialog();
 			}
 		});
-		parametersViewer.getTable().addKeyListener(new KeyAdapter() {
+		parametersViewer.getViewer().getTable().addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent event) {
 				if (event.character == SWT.DEL && event.stateMask == 0) {
@@ -139,13 +139,13 @@
 			}
 		});
 
-		parametersViewer.setColumnProperties(new String[]
+		parametersViewer.getViewer().setColumnProperties(new String[]
 		{ "name", "value" }); //$NON-NLS-1$ //$NON-NLS-2$
 		TextCellEditor textEditor = new TextCellEditor(fTable);
 		CellEditor[] editors = new CellEditor[]
 		{ null, textEditor };
-		parametersViewer.setCellEditors(editors);
-		parametersViewer.setCellModifier(new ICellModifier()
+		parametersViewer.getViewer().setCellEditors(editors);
+		parametersViewer.getViewer().setCellModifier(new ICellModifier()
 		{
 			public boolean canModify(Object element, String property)
 			{
@@ -163,7 +163,7 @@
 				Item item = (Item) element;
 				LaunchAttribute att = (LaunchAttribute) item.getData();
 				att.value = (String) value;
-				parametersViewer.update(att, null);
+				parametersViewer.getViewer().update(att, null);
 				updateLaunchConfigurationDialog();
 			}
 		});
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersContentProvider.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersContentProvider.java
index 6dcb886..2298719 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersContentProvider.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersContentProvider.java
@@ -15,6 +15,7 @@
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
@@ -23,7 +24,7 @@
 public class ParametersContentProvider implements IStructuredContentProvider
 {
 	private LaunchTransform stylesheetEntry;
-	private ParameterViewer parameterViewer;
+	private TableViewer parameterViewer;
 
 	public Object[] getElements(Object inputElement)
 	{
@@ -35,7 +36,7 @@
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
 	{
 		stylesheetEntry = (LaunchTransform) newInput;
-		parameterViewer = (ParameterViewer) viewer;
+		parameterViewer = (TableViewer) viewer;
 	}
 
 	public void dispose()
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetViewer.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetViewer.java
index 7044e11..1d7b8a5 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetViewer.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetViewer.java
@@ -10,45 +10,31 @@
  *******************************************************************************/
 package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
 
-import java.util.List;
-
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.wst.xsl.internal.debug.ui.actions.AbstractStylesheetAction;
 import org.eclipse.wst.xsl.launching.config.LaunchTransform;
 
-public class StylesheetViewer extends TableViewer
+public class StylesheetViewer
 {
+	private TableViewer viewer;
 	private final ListenerList listenerList = new ListenerList();
 
 	public StylesheetViewer(Composite parent)
 	{
-		super(parent);
-
-		getTable().addKeyListener(new KeyAdapter()
-		{
-			@Override
-			public void keyPressed(KeyEvent event)
-			{
-				if (updateSelection(AbstractStylesheetAction.REMOVE, (IStructuredSelection) getSelection()) && event.character == SWT.DEL && event.stateMask == 0)
-				{
-					List<?> selection = getSelectionFromWidget();
-					getStylesheetContentProvider().removeEntries(selection.toArray(new LaunchTransform[0]));
-					notifyChanged();
-				}
-			}
-		});
+		viewer = new TableViewer(parent);
+	}
+	
+	public TableViewer getViewer(){
+		return viewer;
 	}
 
 	private StylesheetContentProvider getStylesheetContentProvider()
 	{
-		return (StylesheetContentProvider) super.getContentProvider();
+		return (StylesheetContentProvider) viewer.getContentProvider();
 	}
 
 	public void setEntries(LaunchTransform[] transforms)
@@ -64,7 +50,7 @@
 
 	public Shell getShell()
 	{
-		return getControl().getShell();
+		return viewer.getControl().getShell();
 	}
 
 	public boolean isEnabled()
@@ -88,13 +74,13 @@
 
 	public IStructuredSelection getSelectedEntries()
 	{
-		IStructuredSelection selection = (IStructuredSelection) getSelection();
+		IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
 		return selection;
 	}
 
 	public void addTransforms(LaunchTransform[] res)
 	{
-		IStructuredSelection sel = (IStructuredSelection) getSelection();
+		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
 		Object beforeElement = sel.getFirstElement();
 		if (getEntries().length > 1 && beforeElement == null)
 			beforeElement = getEntries()[getEntries().length - 1];
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/TransformsBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/TransformsBlock.java
index 1f67daa..abca531 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/TransformsBlock.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/TransformsBlock.java
@@ -66,12 +66,12 @@
 
 		stylesheetViewer = new StylesheetViewer(group);
 		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		stylesheetViewer.getTable().setLayoutData(gd);
+		stylesheetViewer.getViewer().getTable().setLayoutData(gd);
 		stylesheetViewer.addEntriesChangedListener(this);
-		stylesheetViewer.getControl().setFont(font);
-		stylesheetViewer.setLabelProvider(new StylesheetLabelProvider());
-		stylesheetViewer.setContentProvider(new StylesheetContentProvider());
-		stylesheetViewer.getTable().addKeyListener(new KeyAdapter() {
+		stylesheetViewer.getViewer().getControl().setFont(font);
+		stylesheetViewer.getViewer().setLabelProvider(new StylesheetLabelProvider());
+		stylesheetViewer.getViewer().setContentProvider(new StylesheetContentProvider());
+		stylesheetViewer.getViewer().getTable().addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent event) {
 				if (event.character == SWT.DEL && event.stateMask == 0) {
@@ -113,7 +113,7 @@
 
 	public Viewer getStylesheetViewer()
 	{
-		return stylesheetViewer;
+		return stylesheetViewer.getViewer();
 	}
 
 	protected Button createArrowButton(Composite pathButtonComp, AbstractStylesheetAction action, int updown)
@@ -144,10 +144,10 @@
 
 	public void initializeFrom(ILaunchConfiguration configuration)
 	{
-		stylesheetViewer.setInput(pipeline);
+		stylesheetViewer.getViewer().setInput(pipeline);
 		if (pipeline.getTransformDefs().size() > 0)
 		{
-			stylesheetViewer.setSelection(new StructuredSelection(pipeline.getTransformDefs().get(0)));
+			stylesheetViewer.getViewer().setSelection(new StructuredSelection(pipeline.getTransformDefs().get(0)));
 		}
 	}
 
@@ -183,7 +183,7 @@
 	@Override
 	protected Table getTable()
 	{
-		return stylesheetViewer == null ? null : stylesheetViewer.getTable();
+		return stylesheetViewer == null ? null : stylesheetViewer.getViewer().getTable();
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPRuntime.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPRuntime.java
index 8b9e82b..e8eb11f 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPRuntime.java
+++ b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPRuntime.java
@@ -58,7 +58,7 @@
 		return processorTypeRegistry;
 	}
 
-	public static ProcessorRegistry getProcessorRegistry()
+	private static ProcessorRegistry getProcessorRegistry()
 	{
 		synchronized (REGISTRY_LOCK)
 		{
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLValidationPreferencePage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLValidationPreferencePage.java
index dae7fa6..47b22b8 100644
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLValidationPreferencePage.java
+++ b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLValidationPreferencePage.java
@@ -130,7 +130,7 @@
 		inner = createInnerComposite(parent, twistie, columns);
 		
 		createCombo(inner, "Template name conflicts:", ValidationPreferences.TEMPLATE_CONFLICT);
-		createCombo(inner, "Duplicate parameterw:", ValidationPreferences.DUPLICATE_PARAMETER);
+		createCombo(inner, "Duplicate parameters:", ValidationPreferences.DUPLICATE_PARAMETER);
 		createCombo(inner, "Parameter without name attribute:", ValidationPreferences.NAME_ATTRIBUTE_MISSING);
 		createCombo(inner, "Parameter with empty name attribute:", ValidationPreferences.NAME_ATTRIBUTE_EMPTY);