Refactoring to move CMUtil, TagIdentifier and ITLDConstants out to core and common.

2 files changed, 5 insertions, 4 deletions

diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CMRegistry.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CMRegistry.java
index ca2910652..42309579f 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CMRegistry.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CMRegistry.java
@@ -26,6 +26,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
+import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
 import org.eclipse.jst.pagedesigner.IJMTConstants;
 import org.eclipse.jst.pagedesigner.PDPlugin;
 import org.eclipse.jst.pagedesigner.meta.ICMRegistry;
@@ -171,15 +172,15 @@ public class CMRegistry implements ICMRegistry {
 	 */
 	public IElementDescriptor getElementDescriptor(String uri, String tagname) {
 		if (uri == null) {
-			uri = IJMTConstants.URI_HTML;
+			uri = ITLDConstants.URI_HTML;
 		}
-		if (IJMTConstants.URI_HTML.equals(uri)) {
+		if (ITLDConstants.URI_HTML.equals(uri)) {
 			IElementDescriptor desc = getHTMLElementDescriptor(tagname);
 			if (desc != null) {
 				return desc;
 			}
 		}
-		if (IJMTConstants.URI_JSP.equals(uri)) {
+		if (ITLDConstants.URI_JSP.equals(uri)) {
 			return getJSPElementDescriptor(tagname);
 		}
 		for (int i = 0, size = _contributedRegistries.size(); i < size; i++) {
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/DefaultEditorCreator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/DefaultEditorCreator.java
index a5dd3d19a..71fbc24a6 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/DefaultEditorCreator.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/DefaultEditorCreator.java
@@ -13,12 +13,12 @@ package org.eclipse.jst.pagedesigner.meta.internal;
 
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
+import org.eclipse.jst.jsf.core.internal.tld.CMUtil;
 import org.eclipse.jst.pagedesigner.meta.EditorCreator;
 import org.eclipse.jst.pagedesigner.meta.IAttributeDescriptor;
 import org.eclipse.jst.pagedesigner.meta.IBindingHandler;
 import org.eclipse.jst.pagedesigner.properties.celleditors.CellEditorWrapper;
 import org.eclipse.jst.pagedesigner.ui.dialogfields.DialogFieldWrapper;
-import org.eclipse.jst.pagedesigner.utils.CMUtil;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;