[jbosstools-commits] JBoss Tools SVN: r12827 - in trunk: common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/event and 7 other directories.

Thursday, 25 December 2008


Author: dgolovin
Date: 2008-12-24 19:22:03 -0500 (Wed, 24 Dec 2008)
New Revision: 12827

Removed:
  
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/event/ActionDeclinedException.java
Modified:
  
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java
  
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
  
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteAdapter.java
  
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java
  
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java
  
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java
  
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/DropTargetManager.java
  
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteDragSourceListener.java
  
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
  
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/JSPViewerDropAdapter.java
Log:
Exception catch blocks were removed from vpe component. RuntimeException ancestor class
was removed and replaced to Exception ancestor.

Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/DefaultCreateHandler.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -10,20 +10,25 @@
  ******************************************************************************/ 
 package org.jboss.tools.common.meta.action.impl.handlers;
 
-import java.util.*;
+import java.util.Properties;
 
 import org.eclipse.swt.widgets.Display;
-
-import org.jboss.tools.common.meta.*;
-import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.meta.action.*;
-import org.jboss.tools.common.meta.constraint.*;
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.XChild;
+import org.jboss.tools.common.meta.action.XAttributeData;
+import org.jboss.tools.common.meta.action.XEntityData;
+import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.meta.constraint.XAttributeConstraint;
 import org.jboss.tools.common.meta.key.WizardKeys;
-import org.jboss.tools.common.meta.action.impl.AbstractHandler;
-import org.jboss.tools.common.model.event.ActionDeclinedException;
+import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
 import org.jboss.tools.common.model.impl.RegularObjectImpl;
-import org.jboss.tools.common.model.undo.*;
-import org.jboss.tools.common.model.util.*;
+import org.jboss.tools.common.model.undo.XCreateUndo;
+import org.jboss.tools.common.model.undo.XUndoManager;
+import org.jboss.tools.common.model.util.FindObjectHelper;
+import org.jboss.tools.common.model.util.XBundle;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
 
 public class DefaultCreateHandler extends AbstractHandler {
 
@@ -179,7 +184,7 @@
             mes = title(parent, true) + " can contain only " + max +
                          ((max == 1) ? " child " : " children ") +
                          "with entity " + ce + ".";
-            throw new ActionDeclinedException(mes);
+            throw new XModelException(mes);
         }
         boolean b = parent.addChild(child);
 		if(!b &&
child.getModelEntity().getAttribute(XModelObjectLoaderUtil.ATTR_ID_NAME) != null) {

Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/PasteHandler.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -10,13 +10,24 @@
  ******************************************************************************/ 
 package org.jboss.tools.common.meta.action.impl.handlers;
 
-import java.util.*;
-import org.jboss.tools.common.meta.*;
-import org.jboss.tools.common.model.*;
-import org.jboss.tools.common.meta.action.*;
-import org.jboss.tools.common.meta.action.impl.*;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import org.jboss.tools.common.meta.XAdoptManager;
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.XChild;
+import org.jboss.tools.common.meta.XModelEntity;
+import org.jboss.tools.common.meta.action.XAttributeData;
+import org.jboss.tools.common.meta.action.XEntityData;
+import org.jboss.tools.common.meta.action.impl.AbstractHandler;
+import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
+import org.jboss.tools.common.meta.action.impl.XEntityDataImpl;
 import org.jboss.tools.common.meta.impl.XModelMetaDataImpl;
-import org.jboss.tools.common.model.event.ActionDeclinedException;
+import org.jboss.tools.common.model.ServiceDialog;
+import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelBuffer;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
 import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
 
 public class PasteHandler extends AbstractHandler {	
@@ -98,7 +109,7 @@
 		boolean mustGenerate = (found != null && mustGenerate(entity));
 		if(!mustGenerate) {
 			int i = (found == null) ? 0 : PasteEnterNewNameSupport.run(parent, source, copy,
data[0]);
-			if(i != 0) throw new ActionDeclinedException("Paste declined.");
+			if(i != 0) throw new XModelException("Paste declined.");
 		}
         for (int j = 0; j < ad.length; j++)
           copy.setAttributeValue(ad[j].getAttribute().getName(), ad[j].getValue());

Deleted:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/event/ActionDeclinedException.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/event/ActionDeclinedException.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/event/ActionDeclinedException.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- *     Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/ 
-package org.jboss.tools.common.model.event;
-
-public class ActionDeclinedException extends RuntimeException {
-	private static final long serialVersionUID = 1L;
-
-    public ActionDeclinedException(String message) {
-        super(message);
-    }
-
-}

Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/XModelObjectAction.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -10,8 +10,8 @@
  ******************************************************************************/ 
 package org.jboss.tools.common.model.ui.action;
 
-import java.util.*;
-import org.jboss.tools.common.model.ui.wizards.OneStepWizard;
+import java.util.Properties;
+
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
@@ -27,8 +27,7 @@
 import org.jboss.tools.common.meta.action.XRedirect;
 import org.jboss.tools.common.model.XModelException;
 import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.event.ActionDeclinedException;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.common.model.ui.wizards.OneStepWizard;
 
 public class XModelObjectAction extends XModelObjectActionItem {
 	protected XAction action;
@@ -53,60 +52,55 @@
 		}
 		
 	}
+
 	public void actionPerformed() {
-		try {
-			XAction runAction = action;
-			XModelObject runObject = object;
+		XAction runAction = action;
+		XModelObject runObject = object;
 
-			XRedirect redirect = action.getRedirect();
-			XAction redirectAction = null;
-			XModelObject redirectObject = null;
-			while(redirect != null) {
-				redirectAction = redirect.getRedirectAction(runObject);
-				redirectObject = redirect.getRedirectSource(runObject);
-				redirect = redirectAction == null ? null : redirectAction.getRedirect();
-				if(redirect != null) {
-					runObject = redirectObject;
-				}
-			}			
-			if(redirectAction != null && redirectObject != null) {
-				runAction = redirectAction;
+		XRedirect redirect = action.getRedirect();
+		XAction redirectAction = null;
+		XModelObject redirectObject = null;
+		while(redirect != null) {
+			redirectAction = redirect.getRedirectAction(runObject);
+			redirectObject = redirect.getRedirectSource(runObject);
+			redirect = redirectAction == null ? null : redirectAction.getRedirect();
+			if(redirect != null) {
 				runObject = redirectObject;
 			}
-			if(action.getSignificantFlag(object)) {
-				String message = SignificanceMessageFactory.getInstance().getMessage(action, object,
targets) + "?";
-				MessageDialog d = new MessageDialog(getShell(), "Confirmation", null,
message, MessageDialog.QUESTION, new String[]{"OK", "Cancel"}, 0);
-				int m = d.open();
-				if(m != 0) return;
-			}
-			String wizardName = runAction.getWizardClassName();
-			if(wizardName == null || wizardName.equals("")) {
-				action.getEntityData(object);
-				try {
-					Properties p = prepareProperties();
-					if(p == null) p = new Properties();
-					if(getShell() != null) p.put("shell", getShell());
-					if(targets == null) action.executeHandler(object, p);
-					else action.executeHandler(object, targets, p);
-				} catch (ActionDeclinedException e) {
-					return;
-				}
-			} else {
-				runAction.getEntityData(runObject);
-				OneStepWizard w = new OneStepWizard();
+		}			
+		if(redirectAction != null && redirectObject != null) {
+			runAction = redirectAction;
+			runObject = redirectObject;
+		}
+		if(action.getSignificantFlag(object)) {
+			String message = SignificanceMessageFactory.getInstance().getMessage(action, object,
targets) + "?";
+			MessageDialog d = new MessageDialog(getShell(), "Confirmation", null,
message, MessageDialog.QUESTION, new String[]{"OK", "Cancel"}, 0);
+			int m = d.open();
+			if(m != 0) return;
+		}
+		String wizardName = runAction.getWizardClassName();
+		if(wizardName == null || wizardName.equals("")) {
+			action.getEntityData(object);
+			try {
 				Properties p = prepareProperties();
 				if(p == null) p = new Properties();
-				p.put("action", runAction);
-				p.put("object", runObject);
 				if(getShell() != null) p.put("shell", getShell());
-				w.setObject(p);
-				w.execute();
-		   }
-		} catch (ActionDeclinedException de) {
-			//ignore
-		} catch(XModelException e) {
-			ModelUIPlugin.getPluginLog().logError(e);
-		}
+				if(targets == null) action.executeHandler(object, p);
+				else action.executeHandler(object, targets, p);
+			} catch (XModelException e) {
+				return;
+			}
+		} else {
+			runAction.getEntityData(runObject);
+			OneStepWizard w = new OneStepWizard();
+			Properties p = prepareProperties();
+			if(p == null) p = new Properties();
+			p.put("action", runAction);
+			p.put("object", runObject);
+			if(getShell() != null) p.put("shell", getShell());
+			w.setObject(p);
+			w.execute();
+	   }
 	}
 	
 	protected Properties prepareProperties() {

Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/dnd/ControlDragDrop.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -334,8 +334,6 @@
 						if(draggedObject != null) p.put("draggedObject", draggedObject);
 						((IControlDropListener)provider).drop(p);
 					}
-				} catch (ActionDeclinedException de) {
-					ignore();
 				} catch (XModelException e) {
 					ModelUIPlugin.getPluginLog().logError(e);
 				}

Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteAdapter.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteAdapter.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/palette/PaletteAdapter.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -16,6 +16,11 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.dnd.DND;
@@ -37,24 +42,20 @@
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.ui.IActionBars;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuManager;
 import org.jboss.tools.common.model.XModel;
 import org.jboss.tools.common.model.XModelException;
 import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.event.ActionDeclinedException;
 import org.jboss.tools.common.model.event.XModelTreeEvent;
 import org.jboss.tools.common.model.event.XModelTreeListener;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.model.util.IconUtil;
 import org.jboss.tools.common.model.ui.ModelUIPlugin;
 import org.jboss.tools.common.model.ui.dnd.DnDUtil;
 import org.jboss.tools.common.model.ui.dnd.ModelTransfer;
-import org.jboss.tools.common.model.ui.views.palette.model.*;
 import org.jboss.tools.common.model.ui.util.StringUtilities;
+import org.jboss.tools.common.model.ui.views.palette.model.IPaletteNode;
+import org.jboss.tools.common.model.ui.views.palette.model.PaletteElement;
+import org.jboss.tools.common.model.ui.views.palette.model.PaletteModel;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.model.util.IconUtil;
 
 public class PaletteAdapter implements IPaletteAdapter {
 	private static final int TEXT_MARGIN = 4;
@@ -404,9 +405,6 @@
 				try {
 					DnDUtil.paste(o, new Properties());
 					model.getXModel().saveOptions();
-				} catch (ActionDeclinedException de) {
-					//ignore - this exception is thrown to inform that user 
-					//selected cancel option in dialog. 
 				} catch (XModelException e) {
 					message(e);
 				}

Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XDropAdapterAssistant.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -22,12 +22,11 @@
 import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
 import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
 import org.jboss.tools.common.model.XModelBuffer;
+import org.jboss.tools.common.model.XModelException;
 import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.event.ActionDeclinedException;
 import org.jboss.tools.common.model.ui.ModelUIPlugin;
 import org.jboss.tools.common.model.ui.dnd.DnDUtil;
 import org.jboss.tools.common.reporting.ProblemReportingHelper;
-import org.jboss.tools.jst.web.ui.WebUiPlugin;
 
 public class XDropAdapterAssistant extends CommonDropAdapterAssistant {
 
@@ -48,10 +47,7 @@
 		if(DnDUtil.isPasteEnabled(targetObject)) {
 			try {
 				DnDUtil.paste(targetObject, p);
-			} catch (ActionDeclinedException de) {
-				WebUiPlugin.getPluginLog().logError(de);
-				return null;
-			} catch (Exception e) {
+			} catch (XModelException e) {
 				ProblemReportingHelper.reportProblem(ModelUIPlugin.PLUGIN_ID, e);
 			}
 		}

Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -763,11 +763,7 @@
 									VpeEditorPart.this));
 							selectionBar.setVpeController(visualEditor.getController());
 							visualEditor.getController().setSelectionBarController(selectionBar);
-							try {
-								visualEditor.getController().init(sourceEditor, visualEditor);
-							} catch (Exception e) {
-								VpePlugin.getDefault().logError(e);
-							}
+							visualEditor.getController().init(sourceEditor, visualEditor);
 						}
 					});
 			visualEditor.createPartControl(visualContent);

Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/JSPViewerDropAdapter.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/JSPViewerDropAdapter.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/JSPViewerDropAdapter.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -62,13 +62,7 @@
 		dropContext.setDropTargetEvent(event);
 		if (ObjectTransfer.getInstance().isSupportedType(event.currentDataType)) {
 			Object object = null;
-			try {
-				object = ObjectTransfer.getInstance().nativeToJava(event.currentDataType);
-			} catch (Exception e) {
-				//null pointer in Linux
-				VpePlugin.getPluginLog().logError(e);
-				return null;
-			}
+			object = ObjectTransfer.getInstance().nativeToJava(event.currentDataType);
 			if (object == null) return null;
 	      	return extractDragSource(object);
 		} else if(ModelTransfer.getInstance().isSupportedType(event.currentDataType)) {

Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/DropTargetManager.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/DropTargetManager.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/DropTargetManager.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -12,6 +12,15 @@
 
 import java.io.File;
 import java.util.Properties;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTarget;
 import org.eclipse.swt.dnd.DropTargetAdapter;
@@ -21,22 +30,12 @@
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
+import org.jboss.tools.common.model.XModelException;
 import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.event.ActionDeclinedException;
 import org.jboss.tools.common.model.project.IModelNature;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-
 import org.jboss.tools.common.model.ui.dnd.DnDUtil;
 import org.jboss.tools.common.model.ui.dnd.ModelTransfer;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
 import org.jboss.tools.common.reporting.ProblemReportingHelper;
 import org.jboss.tools.vpe.ui.palette.model.PaletteModel;
 import org.jboss.tools.vpe.ui.palette.model.PaletteXModelObject;
@@ -128,9 +127,7 @@
 			try {
 				DnDUtil.paste(o, new Properties());
 				model.getXModel().saveOptions();
-			} catch (ActionDeclinedException de) {
-				PalettePlugin.getPluginLog().logError(de);
-			} catch (Exception e) {
+			} catch (XModelException e) {
 				message(e);
 			}
 		} else {

Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteDragSourceListener.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteDragSourceListener.java	2008-12-24
18:11:51 UTC (rev 12826)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteDragSourceListener.java	2008-12-25
00:22:03 UTC (rev 12827)
@@ -38,7 +38,6 @@
 	}
 
 	public void dragStart(DragSourceEvent event) {
-		try {
 			XModelTransferBuffer.getInstance().enable();
 			List list = ((PaletteViewer)viewer).getSelectedEditParts();
 			XModelObject object = (list.size() == 0) ? null : getObject(list.get(0));
@@ -49,10 +48,7 @@
 			Properties p = new Properties();
 			p.setProperty("isDrag", "true"); //$NON-NLS-1$ //$NON-NLS-2$
 			XActionInvoker.invoke("CopyActions.Copy", object, p); //$NON-NLS-1$
-		} catch (Exception e) {
-			PalettePlugin.getPluginLog().logError(e);
-		}
-		isDragging = true;
+			isDragging = true;
 	}
 	public void dragSetData(DragSourceEvent event) {
 		if (TextTransfer.getInstance().isSupportedType(event.dataType)) {


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r12827 - in trunk: common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/event and 7 other directories.