[536343] Make the conversion of text to selected objects and back pluggable

30 files changed, 657 insertions, 263 deletions

diff --git a/core/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF
index 521ea10f97..604a84364e 100644
--- a/core/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.sse.core; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.wst.sse.core.internal.SSECorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/core/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/provisional/text/ITextRegion.java b/core/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/provisional/text/ITextRegion.java
index b1281ab82c..3b6d29c15f 100644..100755
--- a/core/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/provisional/text/ITextRegion.java
+++ b/core/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/provisional/text/ITextRegion.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
+ * Copyright (c) 2001, 2018 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
@@ -49,6 +49,7 @@ public interface ITextRegion {
 	 * at runtime.
 	 * 
 	 * For use by parsers and reparsers only.
+	 * @deprecated as of 1.5
 	 */
 	void adjustLength(int i);
 
@@ -59,6 +60,7 @@ public interface ITextRegion {
 	 * runtime.
 	 * 
 	 * For use by parsers and reparsers only.
+	 * @deprecated as of 1.5
 	 */
 	void adjustStart(int i);
 
@@ -70,14 +72,16 @@ public interface ITextRegion {
 	 * region, or an illegal argument acception may be thrown at runtime.
 	 * 
 	 * For use by parsers and reparsers only.
+	 * @deprecated as of 1.5
 	 */
 	void adjustTextLength(int i);
 
 	/**
 	 * Makes this regions start, length, and text length equal to the
-	 * paremter's start, length, and text length.
+	 * parameter's start, length, and text length.
 	 * 
 	 * @param region
+	 * @deprecated as of 1.5
 	 */
 	void equatePositions(ITextRegion region);
 
diff --git a/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
index b8c577b190..58878ca48d 100644..100755
--- a/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.sse.ui; singleton:=true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: org.eclipse.wst.sse.ui.internal.SSEUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/SelectionConverter.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/SelectionConverter.java
new file mode 100755
index 0000000000..04b32144f5
--- /dev/null
+++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/SelectionConverter.java
@@ -0,0 +1,83 @@
+/*******************************************************************************

+ * Copyright (c) 2008, 2018 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.wst.sse.ui;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.jface.text.IRegion;

+import org.eclipse.jface.text.Region;

+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;

+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;

+import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;

+

+/**

+ * Responsible for converting between text ranges in a document and the domain

+ * objects covering that range, and determining the text ranges represented by

+ * domain objects. The domain objects handled are those used in structured

+ * selections and being sent across the selection service.

+ * 

+ * @since 1.5

+ */

+public class SelectionConverter {

+	/**

+	 * @param model

+	 * @param start

+	 * @param end

+	 * @return the most specific mapping of this text selection to domain

+	 *         objects

+	 */

+	public Object[] getElements(IStructuredModel model, int start, int end) {

+		Object[] localSelectedStructures = null;

+		if (model != null) {

+			IndexedRegion region = model.getIndexedRegion(start);

+			if (region != null) {

+				if (end <= region.getEndOffset()) {

+					// single selection

+					localSelectedStructures = new Object[1];

+					localSelectedStructures[0] = region;

+				}

+				else {

+					// multiple selection

+					int maxLength = model.getStructuredDocument().getLength();

+					List<IndexedRegion> structures = new ArrayList<>(2);

+					while (region != null && region.getEndOffset() <= end && region.getEndOffset() < maxLength) {

+						structures.add(region);

+						region = model.getIndexedRegion(region.getEndOffset() + 1);

+					}

+					localSelectedStructures = structures.toArray();

+				}

+			}

+		}

+		if (localSelectedStructures == null) {

+			localSelectedStructures = new Object[0];

+		}

+		return localSelectedStructures;

+	}

+

+	/**

+	 * @param o

+	 *            - a domain object being used in structured selections

+	 * @return a {@link Region} containing the object's start and length

+	 */

+	public IRegion getRegion(Object o) {

+		if (o instanceof ITextRegion) {

+			int start = ((ITextRegion) o).getStart();

+			return new Region(start, ((ITextRegion) o).getEnd() - start);

+		}

+		else if (o instanceof IRegion) {

+			return new Region(((IRegion) o).getOffset(), ((IRegion) o).getLength());

+		}

+		int startOffset = ((IndexedRegion) o).getStartOffset();

+		return new Region(startOffset, ((IndexedRegion) o).getEndOffset() - startOffset);

+	}

+}

diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextEditor.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextEditor.java
index 85d2378603..4616610e1a 100644..100755
--- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextEditor.java
+++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/StructuredTextEditor.java
@@ -165,9 +165,7 @@ import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
 import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
 import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
 import org.eclipse.wst.sse.core.internal.text.IExecutionDelegatable;
 import org.eclipse.wst.sse.core.internal.undo.IStructuredTextUndoManager;
 import org.eclipse.wst.sse.core.utils.StringUtils;
@@ -197,7 +195,6 @@ import org.eclipse.wst.sse.ui.internal.debug.ToggleBreakpointsTarget;
 import org.eclipse.wst.sse.ui.internal.derived.HTMLTextPresenter;
 import org.eclipse.wst.sse.ui.internal.editor.EditorModelUtil;
 import org.eclipse.wst.sse.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor;
 import org.eclipse.wst.sse.ui.internal.editor.StructuredModelDocumentProvider;
 import org.eclipse.wst.sse.ui.internal.extension.BreakpointProviderBuilder;
 import org.eclipse.wst.sse.ui.internal.handlers.AddBlockCommentHandler;
@@ -244,7 +241,7 @@ import org.eclipse.wst.sse.ui.views.properties.PropertySheetConfiguration;
  */
 public class StructuredTextEditor extends TextEditor {
 	private class GotoMatchingBracketHandler extends AbstractHandler {
-		public Object execute(ExecutionEvent arg0) throws ExecutionException {
+		public Object execute(ExecutionEvent event) throws ExecutionException {
 			gotoMatchingBracket();
 			return null;
 		}
@@ -358,23 +355,12 @@ public class StructuredTextEditor extends TextEditor {
 			if (event.getSelection() instanceof IStructuredSelection) {
 				ISelection currentSelection = getSelectionProvider().getSelection();
 				if (currentSelection instanceof IStructuredSelection) {
-					Object current = ((IStructuredSelection) currentSelection).toArray();
-					Object newSelection = ((IStructuredSelection) event.getSelection()).toArray();
-					if (!current.equals(newSelection)) {
-						IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-						Object o = selection.getFirstElement();
-						if (o instanceof IndexedRegion) {
-							start = ((IndexedRegion) o).getStartOffset();
-							length = ((IndexedRegion) o).getEndOffset() - start;
-						}
-						else if (o instanceof ITextRegion) {
-							start = ((ITextRegion) o).getStart();
-							length = ((ITextRegion) o).getEnd() - start;
-						}
-						else if (o instanceof IRegion) {
-							start = ((ITextRegion) o).getStart();
-							length = ((ITextRegion) o).getLength();
-						}
+					Object[] currentObjects = ((IStructuredSelection) currentSelection).toArray();
+					Object[] newObjects = ((IStructuredSelection) event.getSelection()).toArray();
+					if (!Arrays.equals(currentObjects, newObjects) && newObjects.length > 0) {
+						IRegion highlightRange = fStructuredSelectionProvider.selectionConverter.getRegion(newObjects[0]);
+						start = highlightRange.getOffset();
+						length = highlightRange.getLength();
 					}
 				}
 			}
@@ -408,48 +394,21 @@ public class StructuredTextEditor extends TextEditor {
 				if (event.getSelection() instanceof IStructuredSelection) {
 					ISelection current = getSelectionProvider().getSelection();
 					if (current instanceof IStructuredSelection) {
-						Object[] currentSelection = ((IStructuredSelection) current).toArray();
-						Object[] newSelection = ((IStructuredSelection) event.getSelection()).toArray();
-						if (!Arrays.equals(currentSelection, newSelection)) {
-							if (newSelection.length > 0) {
-								/*
-								 * No ordering is guaranteed for multiple
-								 * selection
-								 */
-								Object o = newSelection[0];
-								if (o instanceof IndexedRegion) {
-									start = ((IndexedRegion) o).getStartOffset();
-									int end = ((IndexedRegion) o).getEndOffset();
-									if (newSelection.length > 1) {
-										for (int i = 1; i < newSelection.length; i++) {
-											start = Math.min(start, ((IndexedRegion) newSelection[i]).getStartOffset());
-											end = Math.max(end, ((IndexedRegion) newSelection[i]).getEndOffset());
-										}
-										length = end - start;
-									}
-								}
-								else if (o instanceof ITextRegion) {
-									start = ((ITextRegion) o).getStart();
-									int end = ((ITextRegion) o).getEnd();
-									if (newSelection.length > 1) {
-										for (int i = 1; i < newSelection.length; i++) {
-											start = Math.min(start, ((ITextRegion) newSelection[i]).getStart());
-											end = Math.max(end, ((ITextRegion) newSelection[i]).getEnd());
-										}
-										length = end - start;
-									}
-								}
-								else if (o instanceof IRegion) {
-									start = ((IRegion) o).getOffset();
-									int end = start + ((IRegion) o).getLength();
-									if (newSelection.length > 1) {
-										for (int i = 1; i < newSelection.length; i++) {
-											start = Math.min(start, ((IRegion) newSelection[i]).getOffset());
-											end = Math.max(end, ((IRegion) newSelection[i]).getOffset() + ((IRegion) newSelection[i]).getLength());
-										}
-										length = end - start;
-									}
+						Object[] currentObjects = ((IStructuredSelection) current).toArray();
+						Object[] newObjects = ((IStructuredSelection) event.getSelection()).toArray();
+						if (!Arrays.equals(currentObjects, newObjects) && newObjects.length > 0) {
+							// no ordering is guaranteed for multiple selection
+							Object o = newObjects[0];
+							IRegion region = fStructuredSelectionProvider.selectionConverter.getRegion(o);
+							start = region.getOffset();
+							int end = start + region.getLength();
+							if (newObjects.length > 1) {
+								for (int i = 1; i < newObjects.length; i++) {
+									region = fStructuredSelectionProvider.selectionConverter.getRegion(newObjects[i]);
+									start = Math.min(start, region.getOffset());
+									end = Math.max(end, region.getOffset() + region.getLength());
 								}
+								length = end - start;
 							}
 						}
 					}
@@ -542,8 +501,8 @@ public class StructuredTextEditor extends TextEditor {
 		
 		private ISelectionProvider fParentProvider = null;
 		private boolean isFiringSelection = false;
-		private ListenerList listeners = new ListenerList();
-		private ListenerList postListeners = new ListenerList();
+		private ListenerList<ISelectionChangedListener> listeners = new ListenerList<>();
+		private ListenerList<ISelectionChangedListener> postListeners = new ListenerList<>();
 		private ISelection fLastSelection = null;
 		private ISelectionProvider fLastSelectionProvider = null;
 		private SelectionChangedEvent fLastUpdatedSelectionChangedEvent = null;
@@ -553,7 +512,7 @@ public class StructuredTextEditor extends TextEditor {
 		 * selection. Set/reset by the StructuredTextEditor based on a
 		 * per-model adapter on input.
 		 */
-		SelectionConvertor selectionConvertor = new SelectionConvertor();
+		SelectionConverter selectionConverter = new SelectionConverter();
 		
 		StructuredSelectionProvider(ISelectionProvider parentProvider, StructuredTextEditor structuredTextEditor) {
 			fParentProvider = parentProvider;
@@ -584,7 +543,7 @@ public class StructuredTextEditor extends TextEditor {
 			fEditor = null;
 			listeners.clear();
 			postListeners.clear();
-			selectionConvertor = null;
+			selectionConverter = null;
 		}
 
 		private void fireSelectionChanged(final SelectionChangedEvent event, ListenerList listenerList) {
@@ -632,9 +591,9 @@ public class StructuredTextEditor extends TextEditor {
 							 */
 							IBlockTextSelection blockSelection = (IBlockTextSelection) selection;
 							IRegion[] regions = blockSelection.getRegions();
-							Set blockObjects = new LinkedHashSet();
+							Set<Object> blockObjects = new LinkedHashSet<>();
 							for (int i = 0; i < regions.length; i++) {
-								Object[] objects = selectionConvertor.getElements(structuredModel, regions[i].getOffset(), regions[i].getLength());
+								Object[] objects = selectionConverter.getElements(structuredModel, regions[i].getOffset(), regions[i].getLength());
 								for (int j = 0; j < objects.length; j++) {
 									blockObjects.add(objects[j]);
 								}
@@ -644,13 +603,10 @@ public class StructuredTextEditor extends TextEditor {
 						else {
 							int start = ((ITextSelection) selection).getOffset();
 							int end = start + ((ITextSelection) selection).getLength();
-							selection = new StructuredTextSelection(getDocument(), (ITextSelection) selection, selectionConvertor.getElements(structuredModel, start, end));
+							selection = new StructuredTextSelection(getDocument(), (ITextSelection) selection, selectionConverter.getElements(structuredModel, start, end));
 						}
 					}
 				}
-				if (selection == null) {
-					selection = new StructuredTextSelection(getDocument(), (ITextSelection) selection, new Object[0]);
-				}
 			}
 			
 			return selection;
@@ -753,12 +709,10 @@ public class StructuredTextEditor extends TextEditor {
 					structuredModel = localEditor.getInternalModel();
 					if (structuredModel != null) {
 						int start = ((ITextSelection) selection).getOffset();
-						int end = start + ((ITextSelection) selection).getLength();
-						selection = new StructuredTextSelection(getDocument(), (ITextSelection) event.getSelection(), selectionConvertor.getElements(structuredModel, start, end));
+						int end = ((ITextSelection) selection).getLength() + start;
+						selection = new StructuredTextSelection(getDocument(), (ITextSelection) event.getSelection(), selectionConverter.getElements(structuredModel, start, end));
 					}
 				}
-				if (selection == null)
-					selection = new StructuredTextSelection(getDocument(), (ITextSelection) event.getSelection(), new Object[0]);
 			}
 			SelectionChangedEvent newEvent = new SelectionChangedEvent(event.getSelectionProvider(), selection);
 			return newEvent;
@@ -780,27 +734,16 @@ public class StructuredTextEditor extends TextEditor {
 
 					// no ordering is guaranteed for multiple selection
 					Object o = selectedObjects[0];
-					if (o instanceof IndexedRegion) {
-						start = ((IndexedRegion) o).getStartOffset();
-						int end = ((IndexedRegion) o).getEndOffset();
-						if (selectedObjects.length > 1) {
-							for (int i = 1; i < selectedObjects.length; i++) {
-								start = Math.min(start, ((IndexedRegion) selectedObjects[i]).getStartOffset());
-								end = Math.max(end, ((IndexedRegion) selectedObjects[i]).getEndOffset());
-							}
-							length = end - start;
-						}
-					}
-					else if (o instanceof ITextRegion) {
-						start = ((ITextRegion) o).getStart();
-						int end = ((ITextRegion) o).getEnd();
-						if (selectedObjects.length > 1) {
-							for (int i = 1; i < selectedObjects.length; i++) {
-								start = Math.min(start, ((ITextRegion) selectedObjects[i]).getStart());
-								end = Math.max(end, ((ITextRegion) selectedObjects[i]).getEnd());
-							}
-							length = end - start;
+					IRegion region = selectionConverter.getRegion(o);
+					start = region.getOffset();
+					int end = start + region.getLength();
+					if (selectedObjects.length > 1) {
+						for (int i = 1; i < selectedObjects.length; i++) {
+							region = selectionConverter.getRegion(selectedObjects[i]);
+							start = Math.min(start, region.getOffset());
+							end = Math.max(end, region.getOffset() + region.getLength());
 						}
+						length = end - start;
 					}
 
 					if (start > -1) {
@@ -1500,11 +1443,11 @@ public class StructuredTextEditor extends TextEditor {
 
 	protected void createModelDependentFields() {
 		if (fStructuredSelectionProvider != null) {
-			SelectionConvertor convertor = fStructuredModel.getAdapter(SelectionConvertor.class);
+			SelectionConverter convertor = fStructuredModel.getAdapter(SelectionConverter.class);
 			if (convertor != null)
-				fStructuredSelectionProvider.selectionConvertor = convertor;
+				fStructuredSelectionProvider.selectionConverter = convertor;
 			else
-				fStructuredSelectionProvider.selectionConvertor = new SelectionConvertor();
+				fStructuredSelectionProvider.selectionConverter = new SelectionConverter();
 		}
 	}
 
@@ -1895,8 +1838,9 @@ public class StructuredTextEditor extends TextEditor {
 	 * here.
 	 */
 	private void disposeModelDependentFields() {
-		if(fStructuredSelectionProvider != null)
-			fStructuredSelectionProvider.selectionConvertor = new SelectionConvertor();
+		if(fStructuredSelectionProvider != null) {
+			fStructuredSelectionProvider.selectionConverter = new SelectionConverter();
+		}
 	}
 
 	/*
@@ -2377,9 +2321,9 @@ public class StructuredTextEditor extends TextEditor {
 					}
 				});
 				if (fStructuredModel != null) {
-					SelectionConvertor convertor = fStructuredModel.getAdapter(SelectionConvertor.class);
-					if (convertor != null) {
-						fStructuredSelectionProvider.selectionConvertor = convertor;
+					SelectionConverter converter = fStructuredModel.getAdapter(SelectionConverter.class);
+					if (converter != null) {
+						fStructuredSelectionProvider.selectionConverter = converter;
 					}
 				}
 			}
@@ -3421,13 +3365,17 @@ public class StructuredTextEditor extends TextEditor {
 		boolean rangeUpdated = false;
 		if (selection instanceof IStructuredSelection && !((IStructuredSelection) selection).isEmpty()) {
 			Object[] objects = ((IStructuredSelection) selection).toArray();
-			if (objects.length > 0 && objects[0] instanceof IndexedRegion) {
-				int start = ((IndexedRegion) objects[0]).getStartOffset();
-				int end = ((IndexedRegion) objects[0]).getEndOffset();
+			if (objects.length > 0 ) {
+				// no ordering is guaranteed for multiple selection
+				Object o = objects[0];
+				IRegion region = fStructuredSelectionProvider.selectionConverter.getRegion(o);
+				int start = region.getOffset();
+				int end = start + region.getLength();
 				if (objects.length > 1) {
 					for (int i = 1; i < objects.length; i++) {
-						start = Math.min(start, ((IndexedRegion) objects[i]).getStartOffset());
-						end = Math.max(end, ((IndexedRegion) objects[i]).getEndOffset());
+						region = fStructuredSelectionProvider.selectionConverter.getRegion(objects[i]);
+						start = Math.min(start, region.getOffset());
+						end = Math.max(end, region.getOffset() + region.getLength());
 					}
 				}
 				getSourceViewer().setRangeIndication(start, end - start, false);
diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/openon/OpenOnAction.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/openon/OpenOnAction.java
index fe7702c7ce..86e5c2f579 100644..100755
--- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/openon/OpenOnAction.java
+++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/openon/OpenOnAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
+ * Copyright (c) 2001, 2018 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
@@ -48,7 +48,7 @@ public class OpenOnAction extends TextEditorAction {
 
 				// figure out current offset
 				int offset = -1;
-				ISourceEditingTextTools textTools = (ISourceEditingTextTools) getTextEditor().getAdapter(ISourceEditingTextTools.class);
+				ISourceEditingTextTools textTools = getTextEditor().getAdapter(ISourceEditingTextTools.class);
 				if (textTools != null) {
 					offset = textTools.getCaretOffset();
 				}
diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java
index f11928bf18..9326793de6 100644
--- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java
+++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/ui/OffsetStatusLineContributionItem.java
@@ -110,6 +110,7 @@ import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
 import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
 import org.eclipse.wst.sse.core.internal.util.Utilities;
 import org.eclipse.wst.sse.core.utils.StringUtils;
+import org.eclipse.wst.sse.ui.SelectionConverter;
 import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
 import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
 import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey;
@@ -479,6 +480,12 @@ public class OffsetStatusLineContributionItem extends StatusLineContributionItem
 			documentProviderLabel.setText(SSEUIMessages.OffsetStatusLineContributionItem_7 + fTextEditor.getDocumentProvider().getClass().getName()); //$NON-NLS-1$
 			documentProviderLabel.setBackground(composite.getBackground());
 
+			Text selectionConverter = new Text(composite, SWT.SINGLE | SWT.READ_ONLY);
+			gd = new GridData(SWT.FILL, SWT.FILL, true, false);
+			gd.horizontalSpan = 2;
+			selectionConverter.setLayoutData(gd);
+			selectionConverter.setBackground(composite.getBackground());
+
 			Text editorInputLabel = new Text(composite, SWT.SINGLE | SWT.READ_ONLY);
 			gd = new GridData(SWT.FILL, SWT.FILL, true, false);
 			gd.horizontalSpan = 2;
@@ -496,6 +503,8 @@ public class OffsetStatusLineContributionItem extends StatusLineContributionItem
 
 			IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(fDocument);
 			if (model != null) {
+				selectionConverter.setText("Selection Converter class: " + model.getAdapter(SelectionConverter.class).getClass().getName());
+
 				Text modelIdLabel = new Text(composite, SWT.SINGLE | SWT.READ_ONLY);
 				gd = new GridData(SWT.FILL, SWT.FILL, true, false);
 				gd.horizontalSpan = 2;
diff --git a/json/bundles/org.eclipse.wst.json.bower.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.bower.ui/META-INF/MANIFEST.MF
index b43731fa75..ec5d727518 100644..100755
--- a/json/bundles/org.eclipse.wst.json.bower.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.bower.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.json.bower.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.wst.json.bower.ui.internal.BowerUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
  com.ibm.icu,
  org.eclipse.core.resources,
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.jface,
  org.eclipse.ui,
  org.eclipse.jface.text,
diff --git a/json/bundles/org.eclipse.wst.json.eslint.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.eslint.ui/META-INF/MANIFEST.MF
index c71d985ee0..c93df88576 100644..100755
--- a/json/bundles/org.eclipse.wst.json.eslint.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.eslint.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.json.eslint.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.wst.json.eslint.ui.internal.ESLintUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
  com.ibm.icu,
  org.eclipse.core.resources,
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.jface,
  org.eclipse.ui,
  org.eclipse.jface.text,
diff --git a/json/bundles/org.eclipse.wst.json.jshint.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.jshint.ui/META-INF/MANIFEST.MF
index 3d6b55847d..2592969614 100644..100755
--- a/json/bundles/org.eclipse.wst.json.jshint.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.jshint.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.json.jshint.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.wst.json.jshint.ui.internal.JSHintUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
  com.ibm.icu,
  org.eclipse.core.resources,
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.jface,
  org.eclipse.ui,
  org.eclipse.jface.text,
diff --git a/json/bundles/org.eclipse.wst.json.npm.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.npm.ui/META-INF/MANIFEST.MF
index 89cd43a53d..1b4ecd9faa 100644..100755
--- a/json/bundles/org.eclipse.wst.json.npm.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.npm.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.json.npm.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.wst.json.npm.ui.internal.NPMUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
  com.ibm.icu,
  org.eclipse.core.resources,
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.jface,
  org.eclipse.ui,
  org.eclipse.jface.text,
diff --git a/json/bundles/org.eclipse.wst.json.ui/META-INF/MANIFEST.MF b/json/bundles/org.eclipse.wst.json.ui/META-INF/MANIFEST.MF
index 586b272516..10ae11b40a 100644..100755
--- a/json/bundles/org.eclipse.wst.json.ui/META-INF/MANIFEST.MF
+++ b/json/bundles/org.eclipse.wst.json.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.json.ui;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-Activator: org.eclipse.wst.json.ui.internal.JSONUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.wst.sse.core,
  com.ibm.icu,
  org.eclipse.core.resources,
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.jface,
  org.eclipse.ui,
  org.eclipse.jface.text,
diff --git a/json/bundles/org.eclipse.wst.json.ui/plugin.xml b/json/bundles/org.eclipse.wst.json.ui/plugin.xml
index 0eeef427db..36d5c9192b 100644..100755
--- a/json/bundles/org.eclipse.wst.json.ui/plugin.xml
+++ b/json/bundles/org.eclipse.wst.json.ui/plugin.xml
@@ -212,9 +212,8 @@
 	<extension point="org.eclipse.core.runtime.adapters">
 		<factory
 			adaptableType="org.eclipse.wst.json.core.document.IJSONModel"
-			class="org.eclipse.wst.json.ui.internal.editor.JSONSelectionConvertorFactory">
-			<adapter
-            	type="org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor"/>
+			class="org.eclipse.wst.json.ui.internal.editor.JSONSelectionConverterFactory">
+			<adapter type="org.eclipse.wst.sse.ui.SelectionConverter"/>
 		</factory>
 	</extension>
 	
@@ -296,6 +295,24 @@
 	</extension>
 
 	<extension
+		point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
+		<target
+			id="org.eclipse.wst.json.core.jsonsource"
+			name="%JSON_source_target_name">
+		</target>
+	</extension>
+	
+	<extension
+		point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
+		<hyperlinkDetector
+			class="org.eclipse.wst.json.ui.internal.hyperlink.JSONHyperlinkDetector"
+			id="org.eclipse.wst.json.ui.internal.hyperlink.JSONHyperlinkDetector"
+			name="%JSON_detector_name"
+			targetId="org.eclipse.wst.json.core.jsonsource">
+		</hyperlinkDetector>
+	</extension>
+
+	<extension
  		point="org.eclipse.ui.handlers">
 		<handler
 			class="org.eclipse.wst.json.ui.internal.handlers.CleanupDocumentHandler"
diff --git a/json/bundles/org.eclipse.wst.json.ui/src/org/eclipse/wst/json/ui/internal/editor/JSONSelectionConverterFactory.java b/json/bundles/org.eclipse.wst.json.ui/src/org/eclipse/wst/json/ui/internal/editor/JSONSelectionConverterFactory.java
new file mode 100755
index 0000000000..5459754db0
--- /dev/null
+++ b/json/bundles/org.eclipse.wst.json.ui/src/org/eclipse/wst/json/ui/internal/editor/JSONSelectionConverterFactory.java
@@ -0,0 +1,178 @@
+/*******************************************************************************

+ * Copyright (c) 2008, 2018 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

+ *     Angelo Zerr <angelo.zerr@gmail.com> - copied from org.eclipse.wst.xml.ui.internal.editor.DOMSelectionConverterFactory

+ *                                           modified in order to process JSON Objects.           

+ *******************************************************************************/

+package org.eclipse.wst.json.ui.internal.editor;

+

+import java.util.HashSet;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdapterFactory;

+import org.eclipse.jface.text.BadLocationException;

+import org.eclipse.wst.json.core.document.IJSONDocument;

+import org.eclipse.wst.json.core.document.IJSONModel;

+import org.eclipse.wst.json.core.document.IJSONNode;

+import org.eclipse.wst.json.core.document.IJSONObject;

+import org.eclipse.wst.json.ui.internal.Logger;

+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;

+import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;

+import org.eclipse.wst.sse.ui.SelectionConverter;

+

+/**

+ * <p>

+ * Factory to adapt from {@link IJSONModel} to {@link SelectionConverter}

+ * </p>

+ */

+public class JSONSelectionConverterFactory implements IAdapterFactory {

+

+	/** the list of classes this factory can adapt to */

+	private static final Class[] ADAPTER_LIST = new Class[] { SelectionConverter.class };

+

+	/** the adapted class */

+	private static final Object selectionConverter = new JSONSelectionConverter();

+

+	/**

+	 * <p>

+	 * Default constructor

+	 * </p>

+	 */

+	public JSONSelectionConverterFactory() {

+	}

+

+	/**

+	 * <p>

+	 * Adapts {@link IJSONModel} to {@link SelectionConverter}

+	 * </p>

+	 * 

+	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,

+	 *      java.lang.Class)

+	 */

+	@Override

+	public Object getAdapter(Object adaptableObject, Class adapterType) {

+		Object adapter = null;

+		if (adaptableObject instanceof IJSONModel

+				&& SelectionConverter.class.equals(adapterType)) {

+			adapter = selectionConverter;

+		}

+		return adapter;

+	}

+

+	/**

+	 * <p>

+	 * Adapts to {@link SelectionConverter}

+	 * </p>

+	 * 

+	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()

+	 */

+	public Class[] getAdapterList() {

+		return ADAPTER_LIST;

+	}

+

+	/**

+	 * <p>

+	 * {@link SelectionConverter} specific to JSON

+	 * </p>

+	 */

+	private static class JSONSelectionConverter extends SelectionConverter {

+		/**

+		 * <p>

+		 * Default constructor

+		 * </p>

+		 */

+		public JSONSelectionConverter() {

+		}

+

+		/**

+		 * @see org.eclipse.wst.sse.ui.SelectionConverter#getElements(org.eclipse.wst.sse.core.internal.provisional.IStructuredModel,

+		 *      int, int)

+		 */

+		public Object[] getElements(IStructuredModel model, int start, int end) {

+			Object[] localSelectedStructures = null;

+			if (model != null) {

+				IndexedRegion region = model.getIndexedRegion(start);

+

+				if (region instanceof IJSONObject || region instanceof IJSONDocument) {

+					try {

+						String selection = model.getStructuredDocument().get(

+								start, end);

+						int whitespaceLength = beginingWhitespaceLength(selection);

+						region = model.getIndexedRegion(start

+								+ whitespaceLength + 1);

+					} catch (BadLocationException e) {

+						// should never be able to happen

+						Logger.logException(

+								"Bad location on selection, this should never happen",

+								e);

+					}

+				}

+

+				if (region != null) {

+					// if single selection spans selected region

+					// else multiple selection

+					if (end <= region.getEndOffset()) {

+						// single selection

+						localSelectedStructures = new Object[1];

+						localSelectedStructures[0] = region;

+					} else {

+						int maxLength = model.getStructuredDocument()

+								.getLength();

+						Set structures = new HashSet();

+						while (region != null && region.getEndOffset() <= end

+								&& region.getEndOffset() <= maxLength

+								&& !structures.contains(region)) {

+							structures.add(region);

+

+							// use the JSON model to find the next sibling

+							boolean foundNextSibling = false;

+							if (region instanceof IJSONNode) {

+								IJSONNode node = ((IJSONNode) region)

+										.getNextSibling();

+								if (node instanceof IndexedRegion) {

+									region = (IndexedRegion) node;

+									foundNextSibling = true;

+								}

+							}

+

+							if (!foundNextSibling) {

+								region = model.getIndexedRegion(region

+										.getEndOffset() + 1);

+							}

+						}

+						localSelectedStructures = structures.toArray();

+					}

+				}

+			}

+			if (localSelectedStructures == null) {

+				localSelectedStructures = new Object[0];

+			}

+			return localSelectedStructures;

+		}

+

+	}

+

+	/**

+	 * @param s

+	 *            find the length of the whitespace preceding this

+	 *            {@link String}

+	 * @return the length of the whitespace preceding the given {@link String}

+	 */

+	private static int beginingWhitespaceLength(String s) {

+		int length = 0;

+

+		for (int i = 0; i < s.length() && length == 0; ++i) {

+			if (!Character.isWhitespace(s.charAt(i))) {

+				length = i;

+			}

+		}

+

+		return length;

+	}

+}

diff --git a/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
index 1ecce1d48b..1a68e541b2 100644..100755
--- a/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.jsp.ui; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.jst.jsp.ui.internal.JSPUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -42,7 +42,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0]",
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.wst.html.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.css.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.2.0,1.3.0)",
diff --git a/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
index 699a2172c2..ef20d62373 100644..100755
--- a/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.css.ui; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Activator: org.eclipse.wst.css.ui.internal.CSSUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -38,7 +38,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.wst.css.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.html.core;bundle-version="[1.3.0,1.4.0)",
@@ -51,3 +51,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.wst.css.ui
diff --git a/web/bundles/org.eclipse.wst.css.ui/plugin.xml b/web/bundles/org.eclipse.wst.css.ui/plugin.xml
index 7b0ba70066..0894eaa003 100644..100755
--- a/web/bundles/org.eclipse.wst.css.ui/plugin.xml
+++ b/web/bundles/org.eclipse.wst.css.ui/plugin.xml
@@ -189,7 +189,7 @@
 			adaptableType="org.eclipse.wst.css.core.internal.provisional.document.ICSSModel"
 			class="org.eclipse.wst.css.ui.internal.editor.CSSSelectionConverterFactory">
 			<adapter
-				type="org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor"/>
+				type="org.eclipse.wst.sse.ui.SelectionConverter"/>
 		</factory>
 	</extension>
 
diff --git a/web/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/CSSSelectionConverterFactory.java b/web/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/CSSSelectionConverterFactory.java
index 38fa53c3cb..a17ad6ca42 100644..100755
--- a/web/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/CSSSelectionConverterFactory.java
+++ b/web/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/CSSSelectionConverterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2010, 2018 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
@@ -22,18 +22,18 @@ import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
 import org.eclipse.wst.css.ui.internal.Logger;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor;
+import org.eclipse.wst.sse.ui.SelectionConverter;
 
 /**
- * <p>Factory to adapt from {@link ICSSModel} to {@link SelectionConvertor}</p>
+ * <p>Factory to adapt from {@link ICSSModel} to {@link SelectionConverter}</p>
  */
 public class CSSSelectionConverterFactory implements IAdapterFactory {
 
 	/** the list of classes this factory can adapt to */
-	private static final Class[] ADAPTER_LIST = new Class[]{SelectionConvertor.class};
+	private static final Class[] ADAPTER_LIST = new Class[]{SelectionConverter.class};
 	
 	/** the adapted class */
-	private static final Object selectionConvertor = new CSSSelectionConverter();
+	private static final Object selectionConverter = new CSSSelectionConverter();
 	
 	/**
 	 * <p>Default constructor</p>
@@ -42,20 +42,20 @@ public class CSSSelectionConverterFactory implements IAdapterFactory {
 	}
 	
 	/**
-	 * <p>Adapts {@link ICSSModel} to {@link SelectionConvertor}</p>
+	 * <p>Adapts {@link ICSSModel} to {@link SelectionConverter}</p>
 	 * 
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
 	 */
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		Object adapter = null;
-		if (adaptableObject instanceof ICSSModel && SelectionConvertor.class.equals(adapterType)) {
-			adapter = selectionConvertor;
+		if (adaptableObject instanceof ICSSModel && SelectionConverter.class.equals(adapterType)) {
+			adapter = selectionConverter;
 		}
 		return adapter;
 	}
 
 	/**
-	 * <p>Adapts to {@link SelectionConvertor}</p>
+	 * <p>Adapts to {@link SelectionConverter}</p>
 	 * 
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
 	 */
@@ -64,9 +64,9 @@ public class CSSSelectionConverterFactory implements IAdapterFactory {
 	}
 	
 	/**
-	 * <p>{@link SelectionConvertor} specific to CSS</p>
+	 * <p>{@link SelectionConverter} specific to CSS</p>
 	 */
-	private static class CSSSelectionConverter extends SelectionConvertor {
+	public static class CSSSelectionConverter extends SelectionConverter {
 		/**
 		 * <p>Default constructor</p>
 		 */
@@ -74,7 +74,7 @@ public class CSSSelectionConverterFactory implements IAdapterFactory {
 		}
 		
 		/**
-		 * @see org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor#getElements(org.eclipse.wst.sse.core.internal.provisional.IStructuredModel, int, int)
+		 * @see org.eclipse.wst.sse.ui.SelectionConverter#getElements(org.eclipse.wst.sse.core.internal.provisional.IStructuredModel, int, int)
 		 */
 		public Object[] getElements(IStructuredModel model, int start, int end) {
 			Object[] localSelectedStructures = null;
@@ -105,7 +105,7 @@ public class CSSSelectionConverterFactory implements IAdapterFactory {
 					}
 					else {
 						int maxLength = model.getStructuredDocument().getLength();
-						Set structures = new HashSet();
+						Set<IndexedRegion> structures = new HashSet<>();
 						while (region != null && region.getEndOffset() <= end && region.getEndOffset() <= maxLength && !structures.contains(region)) {
 							structures.add(region);
 
diff --git a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
index 019aa60e03..ca14566193 100644..100755
--- a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.html.ui; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Activator: org.eclipse.wst.html.ui.internal.HTMLUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -36,7 +36,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.css.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
diff --git a/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs b/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs
index f3dd524181..8aef8a24b0 100644..100755
--- a/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs
+++ b/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs
@@ -101,6 +101,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

 org.eclipse.jdt.core.compiler.source=1.8

+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

@@ -114,8 +115,11 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=32
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48

 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0

 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16

 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0

 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

@@ -125,6 +129,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64

 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0

+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0

 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

 org.eclipse.jdt.core.formatter.blank_lines_after_package=1

@@ -145,11 +151,15 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false

+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false

 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false

 org.eclipse.jdt.core.formatter.comment.format_block_comments=true

 org.eclipse.jdt.core.formatter.comment.format_header=false

 org.eclipse.jdt.core.formatter.comment.format_html=true

@@ -182,14 +192,16 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true

 org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert

 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

@@ -208,7 +220,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

 org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

@@ -237,6 +249,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

@@ -314,6 +327,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

@@ -369,16 +383,28 @@ org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

 org.eclipse.jdt.core.formatter.lineSplit=999

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3

+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines

 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false

 org.eclipse.jdt.core.formatter.tabulation.char=tab

 org.eclipse.jdt.core.formatter.tabulation.size=4

 org.eclipse.jdt.core.formatter.use_on_off_tags=false

 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false

 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true

 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

 org.eclipse.jdt.core.incompatibleJDKLevel=ignore

diff --git a/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs b/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs
index 7431ce9584..7b849ef4dc 100644..100755
--- a/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/web/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs
@@ -1,54 +1,53 @@
-#Mon Mar 05 17:40:03 EST 2012

-cleanup.format_source_code=false

-cleanup_profile=_SSE Team Styles

-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Licensed Materials - Property of IBM\r\n * \u00A9 Copyright IBM Corporation ${year}. All Rights Reserved.\r\n * U.S. Government Users Restricted Rights - Use, duplication or disclosure\r\n * restricted by GSA ADP Schedule Contract with IBM Corp. \r\n *******************************************************************************/\r\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

-cleanup.add_missing_annotations=false

-cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-cleanup.remove_unused_private_types=true

-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-cleanup.qualify_static_method_accesses_with_declaring_class=false

+cleanup.add_default_serial_version_id=true

 cleanup.add_generated_serial_version_id=false

-cleanup.make_variable_declarations_final=false

-cleanup.always_use_this_for_non_static_field_access=false

-org.eclipse.jdt.ui.overrideannotation=false

-internal.default.compliance=default

-org.eclipse.jdt.ui.keywordthis=false

-cleanup.never_use_parentheses_in_expressions=false

+cleanup.add_missing_annotations=false

+cleanup.add_missing_deprecated_annotations=true

+cleanup.add_missing_nls_tags=false

+cleanup.add_missing_override_annotations=true

 cleanup.add_serial_version_id=true

-cleanup_settings_version=2

-cleanup.remove_unused_private_methods=true

-cleanup.use_this_for_non_static_field_access=false

-cleanup.use_blocks_only_for_return_and_throw=false

-cleanup.remove_unused_private_members=true

-org.eclipse.jdt.ui.exception.name=e

+cleanup.always_use_blocks=true

+cleanup.always_use_parentheses_in_expressions=true

+cleanup.always_use_this_for_non_static_field_access=false

 cleanup.always_use_this_for_non_static_method_access=false

-cleanup.remove_unnecessary_nls_tags=true

+cleanup.convert_to_enhanced_for_loop=false

+cleanup.format_source_code=false

+cleanup.make_local_variable_final=true

+cleanup.make_parameters_final=false

+cleanup.make_private_fields_final=true

+cleanup.make_variable_declarations_final=false

+cleanup.never_use_blocks=false

+cleanup.never_use_parentheses_in_expressions=false

+cleanup.organize_imports=true

 cleanup.qualify_static_field_accesses_with_declaring_class=false

-formatter_profile=_SSE Formatting

-cleanup.add_missing_nls_tags=false

-cleanup.use_this_for_non_static_field_access_only_if_necessary=true

+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-org.eclipse.jdt.ui.gettersetter.use.is=true

-cleanup.remove_unnecessary_casts=true

 cleanup.qualify_static_member_accesses_with_declaring_class=true

-cleanup.use_parentheses_in_expressions=true

-cleanup.remove_unused_private_fields=true

-cleanup.make_parameters_final=false

-eclipse.preferences.version=1

-cleanup.remove_unused_imports=true

-cleanup.organize_imports=true

-cleanup.convert_to_enhanced_for_loop=false

+cleanup.qualify_static_method_accesses_with_declaring_class=false

 cleanup.remove_private_constructors=true

-cleanup.always_use_blocks=true

-cleanup.never_use_blocks=false

-cleanup.always_use_parentheses_in_expressions=true

-formatter_settings_version=12

-cleanup.use_this_for_non_static_method_access=false

+cleanup.remove_unnecessary_casts=true

+cleanup.remove_unnecessary_nls_tags=true

+cleanup.remove_unused_imports=true

 cleanup.remove_unused_local_variables=false

-cleanup.make_private_fields_final=true

-org.eclipse.jdt.ui.javadoc=true

-cleanup.add_missing_deprecated_annotations=true

-cleanup.add_default_serial_version_id=true

+cleanup.remove_unused_private_fields=true

+cleanup.remove_unused_private_members=true

+cleanup.remove_unused_private_methods=true

+cleanup.remove_unused_private_types=true

 cleanup.use_blocks=true

-cleanup.add_missing_override_annotations=true

-cleanup.make_local_variable_final=true

+cleanup.use_blocks_only_for_return_and_throw=false

+cleanup.use_parentheses_in_expressions=true

+cleanup.use_this_for_non_static_field_access=false

+cleanup.use_this_for_non_static_field_access_only_if_necessary=true

+cleanup.use_this_for_non_static_method_access=false

+cleanup.use_this_for_non_static_method_access_only_if_necessary=true

+cleanup_profile=_SSE Team Styles

+cleanup_settings_version=2

+eclipse.preferences.version=1

+formatter_profile=_SSE Formatting

+formatter_settings_version=14

+internal.default.compliance=default

+org.eclipse.jdt.ui.exception.name=e

+org.eclipse.jdt.ui.gettersetter.use.is=true

+org.eclipse.jdt.ui.javadoc=true

+org.eclipse.jdt.ui.keywordthis=false

+org.eclipse.jdt.ui.overrideannotation=false

+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Licensed Materials - Property of IBM\r\n * \u00A9 Copyright IBM Corporation ${year}. All Rights Reserved.\r\n * U.S. Government Users Restricted Rights - Use, duplication or disclosure\r\n * restricted by GSA ADP Schedule Contract with IBM Corp. \r\n *******************************************************************************/\r\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs b/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs
index ca842c4441..f16dcca33d 100644..100755
--- a/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs
@@ -108,6 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

 org.eclipse.jdt.core.compiler.source=1.8

+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

@@ -121,8 +122,11 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=32
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48

 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0

 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16

 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0

 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

@@ -132,6 +136,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64

 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0

+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0

 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

 org.eclipse.jdt.core.formatter.blank_lines_after_package=1

@@ -152,11 +158,15 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false

+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false

 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false

 org.eclipse.jdt.core.formatter.comment.format_block_comments=true

 org.eclipse.jdt.core.formatter.comment.format_header=false

 org.eclipse.jdt.core.formatter.comment.format_html=true

@@ -189,6 +199,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true

 org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

@@ -197,6 +208,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert

 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

@@ -215,7 +227,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

 org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

@@ -244,6 +256,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

@@ -321,6 +334,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

@@ -380,12 +394,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3

+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines

+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines

 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false

 org.eclipse.jdt.core.formatter.tabulation.char=tab

 org.eclipse.jdt.core.formatter.tabulation.size=4

 org.eclipse.jdt.core.formatter.use_on_off_tags=false

 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false

 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true

 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

 org.eclipse.jdt.core.incompatibleJDKLevel=ignore

diff --git a/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.ui.prefs b/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.ui.prefs
index 0b15e9ce14..7b849ef4dc 100644..100755
--- a/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/web/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -1,54 +1,53 @@
-#Mon Mar 05 17:40:19 EST 2012

-cleanup.format_source_code=false

-cleanup_profile=_SSE Team Styles

-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Licensed Materials - Property of IBM\r\n * \u00A9 Copyright IBM Corporation ${year}. All Rights Reserved.\r\n * U.S. Government Users Restricted Rights - Use, duplication or disclosure\r\n * restricted by GSA ADP Schedule Contract with IBM Corp. \r\n *******************************************************************************/\r\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

-cleanup.add_missing_annotations=false

-cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-cleanup.remove_unused_private_types=true

-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-cleanup.qualify_static_method_accesses_with_declaring_class=false

+cleanup.add_default_serial_version_id=true

 cleanup.add_generated_serial_version_id=false

-cleanup.make_variable_declarations_final=false

-cleanup.always_use_this_for_non_static_field_access=false

-org.eclipse.jdt.ui.overrideannotation=false

-internal.default.compliance=default

-org.eclipse.jdt.ui.keywordthis=false

-cleanup.never_use_parentheses_in_expressions=false

+cleanup.add_missing_annotations=false

+cleanup.add_missing_deprecated_annotations=true

+cleanup.add_missing_nls_tags=false

+cleanup.add_missing_override_annotations=true

 cleanup.add_serial_version_id=true

-cleanup_settings_version=2

-cleanup.remove_unused_private_methods=true

-cleanup.use_this_for_non_static_field_access=false

-cleanup.use_blocks_only_for_return_and_throw=false

-cleanup.remove_unused_private_members=true

-org.eclipse.jdt.ui.exception.name=e

+cleanup.always_use_blocks=true

+cleanup.always_use_parentheses_in_expressions=true

+cleanup.always_use_this_for_non_static_field_access=false

 cleanup.always_use_this_for_non_static_method_access=false

-cleanup.remove_unnecessary_nls_tags=true

+cleanup.convert_to_enhanced_for_loop=false

+cleanup.format_source_code=false

+cleanup.make_local_variable_final=true

+cleanup.make_parameters_final=false

+cleanup.make_private_fields_final=true

+cleanup.make_variable_declarations_final=false

+cleanup.never_use_blocks=false

+cleanup.never_use_parentheses_in_expressions=false

+cleanup.organize_imports=true

 cleanup.qualify_static_field_accesses_with_declaring_class=false

-formatter_profile=_SSE Formatting

-cleanup.add_missing_nls_tags=false

-cleanup.use_this_for_non_static_field_access_only_if_necessary=true

+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

 cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-org.eclipse.jdt.ui.gettersetter.use.is=true

-cleanup.remove_unnecessary_casts=true

 cleanup.qualify_static_member_accesses_with_declaring_class=true

-cleanup.use_parentheses_in_expressions=true

-cleanup.remove_unused_private_fields=true

-cleanup.make_parameters_final=false

-eclipse.preferences.version=1

-cleanup.remove_unused_imports=true

-cleanup.organize_imports=true

-cleanup.convert_to_enhanced_for_loop=false

+cleanup.qualify_static_method_accesses_with_declaring_class=false

 cleanup.remove_private_constructors=true

-cleanup.always_use_blocks=true

-cleanup.never_use_blocks=false

-cleanup.always_use_parentheses_in_expressions=true

-formatter_settings_version=12

-cleanup.use_this_for_non_static_method_access=false

+cleanup.remove_unnecessary_casts=true

+cleanup.remove_unnecessary_nls_tags=true

+cleanup.remove_unused_imports=true

 cleanup.remove_unused_local_variables=false

-cleanup.make_private_fields_final=true

-org.eclipse.jdt.ui.javadoc=true

-cleanup.add_missing_deprecated_annotations=true

-cleanup.add_default_serial_version_id=true

+cleanup.remove_unused_private_fields=true

+cleanup.remove_unused_private_members=true

+cleanup.remove_unused_private_methods=true

+cleanup.remove_unused_private_types=true

 cleanup.use_blocks=true

-cleanup.add_missing_override_annotations=true

-cleanup.make_local_variable_final=true

+cleanup.use_blocks_only_for_return_and_throw=false

+cleanup.use_parentheses_in_expressions=true

+cleanup.use_this_for_non_static_field_access=false

+cleanup.use_this_for_non_static_field_access_only_if_necessary=true

+cleanup.use_this_for_non_static_method_access=false

+cleanup.use_this_for_non_static_method_access_only_if_necessary=true

+cleanup_profile=_SSE Team Styles

+cleanup_settings_version=2

+eclipse.preferences.version=1

+formatter_profile=_SSE Formatting

+formatter_settings_version=14

+internal.default.compliance=default

+org.eclipse.jdt.ui.exception.name=e

+org.eclipse.jdt.ui.gettersetter.use.is=true

+org.eclipse.jdt.ui.javadoc=true

+org.eclipse.jdt.ui.keywordthis=false

+org.eclipse.jdt.ui.overrideannotation=false

+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Licensed Materials - Property of IBM\r\n * \u00A9 Copyright IBM Corporation ${year}. All Rights Reserved.\r\n * U.S. Government Users Restricted Rights - Use, duplication or disclosure\r\n * restricted by GSA ADP Schedule Contract with IBM Corp. \r\n *******************************************************************************/\r\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/web/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java b/web/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java
index 893127f34d..b5559af9a1 100644..100755
--- a/web/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java
+++ b/web/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java
@@ -1,15 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2004, 2018 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.wst.css.ui.tests;
 
-import junit.framework.TestCase;
+import java.io.ByteArrayInputStream;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Plugin;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
 import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
+import org.eclipse.wst.css.ui.internal.editor.CSSSelectionConverterFactory;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.ui.SelectionConverter;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
+
+import junit.framework.TestCase;
 
 /**
  * 
  * @since 1.0
  */
 public class ExistenceTest extends TestCase {
+
 	/**
 	 * tests if CSSUIPlugin can be loaded
 	 */
@@ -17,4 +50,46 @@ public class ExistenceTest extends TestCase {
 		Plugin p = CSSUIPlugin.getDefault();
 		assertNotNull("couldn't load CSS UI plugin", p);
 	}
+
+	public void testSelectionConverter() throws Exception {
+		String projectName = getClass().getName() + "_CSS";
+		IProject project = createProject(projectName);
+		String contents = "@MEDIA {\n\tACRONYM {\n\t}\n}";
+		IFile testFile = project.getFile("testfile.css");
+		testFile.create(new ByteArrayInputStream(contents.getBytes("utf8")), true, null);
+
+		IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		IWorkbenchPage page = workbenchWindow.getActivePage();
+		IEditorPart editor = IDE.openEditor(page, testFile);
+		assertEquals("Not the expected editor class, are capabilities in the way?", StructuredTextEditor.class.getName(), editor.getClass().getName());
+
+
+		IDocument doc = editor.getAdapter(IDocument.class);
+		IModelManager modelManager = StructuredModelManager.getModelManager();
+		IStructuredModel model = null;
+		try {
+			model = modelManager.getExistingModelForEdit(doc);
+			assertTrue(model != null);
+			String expected = CSSSelectionConverterFactory.CSSSelectionConverter.class.getName();
+			String actual = model.getAdapter(SelectionConverter.class).getClass().getName();
+			assertEquals("The selection convertor for basic CSS was not the expected type!", expected, actual);
+		}
+		finally {
+			if (model != null) {
+				model.releaseFromEdit();
+			}
+		}
+
+		page.closeAllEditors(false);
+	}
+
+	private IProject createProject(String projName) throws CoreException {
+		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
+
+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
+
+		project.create(description, new NullProgressMonitor());
+		project.open(new NullProgressMonitor());
+		return project;
+	}
 }
diff --git a/xml/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
index 8634cfcc68..f8ab2d38d3 100644..100755
--- a/xml/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.dtd.ui; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Activator: org.eclipse.wst.dtd.ui.internal.DTDUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -31,10 +31,11 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.wst.common.ui;bundle-version="[1.1.500,1.2.0)",
  org.eclipse.wst.dtd.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.wst.dtd.ui
diff --git a/xml/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
index 4dc2bc3af2..466803381d 100644..100755
--- a/xml/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.xml.ui; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Activator: org.eclipse.wst.xml.ui.internal.XMLUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,6 +11,9 @@ Export-Package: org.eclipse.wst.xml.ui,
  org.eclipse.wst.xml.ui.internal.actions;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
  org.eclipse.wst.xml.ui.internal.autoedit;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
  org.eclipse.wst.xml.ui.internal.catalog;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
+ org.eclipse.wst.xml.ui.internal.catalog.icons.etool50;x-internal:=true,
+ org.eclipse.wst.xml.ui.internal.catalog.icons.obj16;x-internal:=true,
+ org.eclipse.wst.xml.ui.internal.catalog.icons.ovr16;x-internal:=true,
  org.eclipse.wst.xml.ui.internal.contentassist;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
  org.eclipse.wst.xml.ui.internal.contentoutline;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
  org.eclipse.wst.xml.ui.internal.correction;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
@@ -51,7 +54,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.ui.views;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
@@ -65,3 +68,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)"
 Bundle-ActivationPolicy: lazy; exclude:="org.eclipse.wst.xml.ui.internal.validation.core.errorinfo,org.eclipse.wst.xml.ui.internal.editor.propertytester"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.wst.xml.ui
diff --git a/xml/bundles/org.eclipse.wst.xml.ui/plugin.xml b/xml/bundles/org.eclipse.wst.xml.ui/plugin.xml
index 9fdeed3402..988cedd7ed 100644..100755
--- a/xml/bundles/org.eclipse.wst.xml.ui/plugin.xml
+++ b/xml/bundles/org.eclipse.wst.xml.ui/plugin.xml
@@ -467,9 +467,9 @@
 	<extension point="org.eclipse.core.runtime.adapters">
 		<factory
 			adaptableType="org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel"
-			class="org.eclipse.wst.xml.ui.internal.editor.DOMSelectionConvertorFactory">
+			class="org.eclipse.wst.xml.ui.internal.editor.DOMSelectionConverterFactory">
 			<adapter
-            	type="org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor"/>
+            	type="org.eclipse.wst.sse.ui.SelectionConverter"/>
 		</factory>
 		<factory
 			adaptableType="org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel"
diff --git a/xml/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/DOMSelectionConvertorFactory.java b/xml/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/DOMSelectionConverterFactory.java
index d278d9a144..9d2297723f 100644..100755
--- a/xml/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/DOMSelectionConvertorFactory.java
+++ b/xml/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/DOMSelectionConverterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2008, 2012 IBM Corporation and others.

+ * Copyright (c) 2008, 2018 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

@@ -16,7 +16,7 @@ import java.util.List;
 

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;

-import org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor;

+import org.eclipse.wst.sse.ui.SelectionConverter;

 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;

 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;

 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;

@@ -26,13 +26,13 @@ import org.w3c.dom.NamedNodeMap;
  * @author nitin

  * 

  */

-public class DOMSelectionConvertorFactory implements IAdapterFactory {

+public class DOMSelectionConverterFactory implements IAdapterFactory {

 

-	private static final Class[] ADAPTER_LIST = new Class[]{SelectionConvertor.class};

+	private static final Class[] ADAPTER_LIST = new Class[]{SelectionConverter.class};

 

-	private static class XMLSelectionConvertor extends SelectionConvertor {

+	public static class XMLSelectionConverter extends SelectionConverter {

 		/* (non-Javadoc)

-		 * @see org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor#getElements(org.eclipse.wst.sse.core.internal.provisional.IStructuredModel, int, int)

+		 * @see org.eclipse.wst.sse.ui.SelectionConverter#getElements(org.eclipse.wst.sse.core.internal.provisional.IStructuredModel, int, int)

 		 */

 		public Object[] getElements(IStructuredModel model, int start, int end) {

 			Object[] localSelectedStructures = null;

@@ -44,7 +44,7 @@ public class DOMSelectionConvertorFactory implements IAdapterFactory {
 						localSelectedStructures = new Object[1];

 						localSelectedStructures[0] = region;

 					} else {

-						List structures = new ArrayList(2);

+						List<IDOMNode> structures = new ArrayList<>(2);

 

 						IDOMNode node = region;

 						while(node != null) {

@@ -89,12 +89,12 @@ public class DOMSelectionConvertorFactory implements IAdapterFactory {
 		}

 	}

 

-	private static final Object selectionConvertor = new XMLSelectionConvertor();

+	private static final Object selectionConverter = new XMLSelectionConverter();

 

 	/**

 	 * 

 	 */

-	public DOMSelectionConvertorFactory() {

+	public DOMSelectionConverterFactory() {

 	}

 

 	/*

@@ -105,8 +105,8 @@ public class DOMSelectionConvertorFactory implements IAdapterFactory {
 	 * java.lang.Class)

 	 */

 	public Object getAdapter(Object adaptableObject, Class adapterType) {

-		if (adaptableObject instanceof IDOMModel && SelectionConvertor.class.equals(adapterType))

-			return selectionConvertor;

+		if (adaptableObject instanceof IDOMModel && SelectionConverter.class.equals(adapterType))

+			return selectionConverter;

 		return null;

 	}

 

diff --git a/xml/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF b/xml/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
index 58cbcd486a..aa7ee806ae 100644..100755
--- a/xml/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
+++ b/xml/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %_UI_PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.wst.xsd.ui; singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.100.qualifier
 Bundle-Activator: org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
@@ -61,7 +61,7 @@ Export-Package: org.eclipse.wst.xsd.ui.internal.actions;x-internal:=true,
 Require-Bundle: org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.2.300,2.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.sse.ui;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.common.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)",
@@ -85,3 +85,4 @@ Require-Bundle: org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.
 Import-Package: com.ibm.icu.util;version="3.8.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.wst.xsd.ui
diff --git a/xml/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java b/xml/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
index 4009e8dd89..37b55ed027 100644..100755
--- a/xml/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
+++ b/xml/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java
@@ -42,9 +42,11 @@ import org.eclipse.ui.ide.FileStoreEditorInput;
 import org.eclipse.ui.ide.IDE;
 import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
+import org.eclipse.wst.sse.ui.SelectionConverter;
 import org.eclipse.wst.sse.ui.StructuredTextEditor;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xml.ui.internal.editor.DOMSelectionConverterFactory;
 import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
 import org.w3c.dom.NodeList;
 
@@ -189,4 +191,25 @@ public class TestOpenEditorXML extends TestCase {
 		page.closeEditor(editor, false);
 		assertTrue("Unable to open structured text editor " + fEditor, (fEditor instanceof XMLMultiPageEditorPart) || (fEditor instanceof StructuredTextEditor));
 	}
+
+	public void testSelectionConverter() {
+		IDocument doc = fEditor.getAdapter(IDocument.class);
+		doc.set("<html><body><h1>Title</h1></body></html>");
+		// set h1 to readonly
+		IModelManager modelManager = StructuredModelManager.getModelManager();
+		IDOMModel model = null;
+		try {
+			model = (IDOMModel) modelManager.getExistingModelForEdit(doc);
+			if (model != null) {
+				String expected = DOMSelectionConverterFactory.XMLSelectionConverter.class.getName();
+				String actual = model.getAdapter(SelectionConverter.class).getClass().getName();
+				assertEquals("The selection convertor for basic XML was not the expected type!", expected, actual);
+			}
+		}
+		finally {
+			if (model != null) {
+				model.releaseFromEdit();
+			}
+		}
+	}
 }