Significant refactoring of VPD palette and tag creation code to use new metadata. Changes to StandardMetaData framework and model. Update of HTML, JSP, JSF HTML and JSF Core metadata to new standard model.

4 files changed, 21 insertions, 21 deletions

diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceDropTargetListener.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceDropTargetListener.java
index 153791fec..37a3bec9e 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceDropTargetListener.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceDropTargetListener.java
@@ -15,7 +15,7 @@ import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.dnd.TemplateTransfer;
 import org.eclipse.jst.pagedesigner.commands.PaletteDropInsertCommand;
 import org.eclipse.jst.pagedesigner.editors.pagedesigner.PageDesignerResources;
-import org.eclipse.jst.pagedesigner.editors.palette.impl.PaletteItemDescriptor;
+import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.dnd.DropTargetEvent;
 import org.eclipse.swt.dnd.TextTransfer;
@@ -122,14 +122,14 @@ public class DesignerSourceDropTargetListener extends
 				event.currentDataType)) {
 			Object data = event.data;
 			PaletteDropInsertCommand command = null;
-			if (data instanceof PaletteItemDescriptor) {
-				PaletteItemDescriptor descriptor = (PaletteItemDescriptor) data;
+			if (data instanceof TagToolPaletteEntry) {
+				TagToolPaletteEntry tagItem = (TagToolPaletteEntry) data;
 				// "Create new item"
 				command = new PaletteDropInsertCommand(
 						PageDesignerResources
 								.getInstance()
 								.getString(
-										"DesignerSourceDropTargetListener.InserCommandLabel"), _textEditor, descriptor, _location); //$NON-NLS-1$
+										"DesignerSourceDropTargetListener.InserCommandLabel"), _textEditor, tagItem, _location); //$NON-NLS-1$
 			}
 			return command;
 		}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceMouseTrackAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceMouseTrackAdapter.java
index 65af7465b..6446e6af9 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceMouseTrackAdapter.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceMouseTrackAdapter.java
@@ -16,8 +16,7 @@ import org.eclipse.gef.palette.ToolEntry;
 import org.eclipse.jst.pagedesigner.commands.PaletteDropInsertCommand;
 import org.eclipse.jst.pagedesigner.commands.SourceViewerCommand;
 import org.eclipse.jst.pagedesigner.editors.pagedesigner.PageDesignerResources;
-import org.eclipse.jst.pagedesigner.editors.palette.impl.PaletteItemDescriptor;
-import org.eclipse.jst.pagedesigner.itemcreation.ItemToolEntry;
+import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
@@ -102,9 +101,8 @@ public class DesignerSourceMouseTrackAdapter extends
 	public Object getPaletteObject() {
 		if (_domain.getPaletteViewer() != null) {
 			Object tool = _domain.getPaletteViewer().getActiveTool();
-			if (tool instanceof ItemToolEntry) {
-				Object object = ((ItemToolEntry) tool).getItemDesc();
-				return object;
+			if (tool instanceof TagToolPaletteEntry) {
+				return tool;
 			}
 		}
 		return null;
@@ -131,8 +129,8 @@ public class DesignerSourceMouseTrackAdapter extends
 	private PaletteDropInsertCommand getCommand(MouseEvent event) {
 		Object data = getPaletteObject();
 		PaletteDropInsertCommand command = null;
-		if (data instanceof PaletteItemDescriptor) {
-			PaletteItemDescriptor descriptor = (PaletteItemDescriptor) data;
+		if (data instanceof TagToolPaletteEntry) {
+			TagToolPaletteEntry descriptor = (TagToolPaletteEntry) data;
 			// "Create new item"
 			command = new PaletteDropInsertCommand(
 					PageDesignerResources
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerTemplateTransferDragSourceListener.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerTemplateTransferDragSourceListener.java
index 91d0409e9..c1d386817 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerTemplateTransferDragSourceListener.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerTemplateTransferDragSourceListener.java
@@ -16,7 +16,7 @@ import java.util.List;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gef.dnd.TemplateTransferDragSourceListener;
-import org.eclipse.jst.pagedesigner.itemcreation.ItemToolEntry;
+import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry;
 
 /**
  * @author mengbo
@@ -39,8 +39,8 @@ public class DesignerTemplateTransferDragSourceListener extends
 				EditPart editpart = (EditPart) getViewer()
 						.getSelectedEditParts().get(0);
 				Object model = editpart.getModel();
-				if (model instanceof ItemToolEntry) {
-					return ((ItemToolEntry) model).getItemDesc();
+				if (model instanceof TagToolPaletteEntry) {
+					return model;
 				}
 			}
 		}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/PDTemplateTransferDropTargetListener.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/PDTemplateTransferDropTargetListener.java
index 0a48b4939..9a07a9ce2 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/PDTemplateTransferDropTargetListener.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/PDTemplateTransferDropTargetListener.java
@@ -15,8 +15,9 @@ import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.dnd.AbstractTransferDropTargetListener;
 import org.eclipse.gef.dnd.TemplateTransfer;
+import org.eclipse.gef.requests.CreateRequest;
 import org.eclipse.jst.pagedesigner.PDPlugin;
-import org.eclipse.jst.pagedesigner.editors.palette.impl.PaletteItemDescriptor;
+import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry;
 import org.eclipse.jst.pagedesigner.itemcreation.ItemCreationRequest;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTargetEvent;
@@ -39,7 +40,8 @@ public class PDTemplateTransferDropTargetListener extends
 	 * @see org.eclipse.gef.dnd.AbstractTransferDropTargetListener#createTargetRequest()
 	 */
 	protected Request createTargetRequest() {
-		Request request = new ItemCreationRequest();
+		ItemCreationRequest request = new ItemCreationRequest();
+		TagToolPaletteEntry tagItem = (TagToolPaletteEntry)TemplateTransfer.getInstance().getTemplate();
 		return request;
 	}
 
@@ -87,12 +89,12 @@ public class PDTemplateTransferDropTargetListener extends
 			ItemCreationRequest request = (ItemCreationRequest) getCreateRequest();
             Object transferObj = TemplateTransfer.getInstance().getObject();
             
-            if (transferObj instanceof PaletteItemDescriptor)
+            if (transferObj instanceof TagToolPaletteEntry)
             {
-                PaletteItemDescriptor itemDescriptor = 
-                    (PaletteItemDescriptor) transferObj;
-                
-                request.setItemDescriptor(itemDescriptor);
+            	TagToolPaletteEntry tagItem = 
+                    (TagToolPaletteEntry) transferObj;
+
+                request.setTagToolPaletteEntry(tagItem);
                 request.setLocation(getDropLocation());
             }
             else