diff --git a/trunk/SIPRPSoft/lib/evolute.jar b/trunk/SIPRPSoft/lib/evolute.jar
index 5899081b..d1607969 100644
Binary files a/trunk/SIPRPSoft/lib/evolute.jar and b/trunk/SIPRPSoft/lib/evolute.jar differ
diff --git a/trunk/SIPRPSoft/src/leaf/ui/DraggableLeafTree.java b/trunk/SIPRPSoft/src/leaf/ui/DraggableLeafTree.java
deleted file mode 100644
index 42324fa6..00000000
--- a/trunk/SIPRPSoft/src/leaf/ui/DraggableLeafTree.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package leaf.ui;
-
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.Rectangle;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-
-
-public abstract class DraggableLeafTree extends LeafTree 
-{
-
-	private static final long serialVersionUID = 1L;
-	
-	public DraggableLeafTree( TreeModel model )
-	{
-		super(model);
-		setDragEnabled( true );
-		setAutoscrolls( true );
-		setDropTarget();
-	}
-	
-	public abstract void setDropTarget( );
-	
-	public void autoscroll( Point cursorLocation )  
-	{
-        Insets insets = getAutoscrollInsets();
-        Rectangle outer = getVisibleRect();
-        Rectangle inner = new Rectangle( outer.x + insets.left, outer.y + insets.top, outer.width - ( insets.left+insets.right ), outer.height - ( insets.top+insets.bottom ) );
-        
-        if ( !inner.contains(cursorLocation ) )  
-        {
-                Rectangle scrollRect = new Rectangle( cursorLocation.x - insets.left, cursorLocation.y - insets.top, insets.left + insets.right, insets.top + insets.bottom );
-                scrollRectToVisible(scrollRect);
-        }
-	}
-	
-	public Insets getAutoscrollInsets()  
-	{
-	     return new Insets( 20, 20, 20, 20 ); 
-	}
-	
-
-	
-	public Object getSelectedObject()
-	{
-		DefaultMutableTreeNode node = getSelectedNode();
-		return node == null ? null : node.getUserObject();
-	}
-
-	public DefaultMutableTreeNode getSelectedNode()
-	{
-		TreePath path = getSelectionPath();
-		return path == null ? null : (DefaultMutableTreeNode) path.getLastPathComponent();
-	}
-
-}
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/DnDRiscosListener.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/DnDRiscosListener.java
index 53b99439..5a6e7ab9 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/DnDRiscosListener.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/DnDRiscosListener.java
@@ -3,8 +3,6 @@ package siprp.higiene.gestao.riscos;
 import java.awt.Point;
 import java.awt.dnd.DropTargetDragEvent;
 import java.awt.dnd.DropTargetDropEvent;
-import java.awt.dnd.DropTargetEvent;
-import java.awt.dnd.DropTargetListener;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
@@ -14,9 +12,10 @@ import siprp.data.outer.HsRiscoMedidaData;
 import siprp.data.outer.HsRiscoTemaData;
 
 import com.evolute.entity.evo.EvoDataException;
+import com.evolute.swing.tree.EvoTreeDnDListener;
 import com.evolute.utils.error.ErrorLogger;
 
-public class DnDRiscosListener implements DropTargetListener
+public class DnDRiscosListener extends EvoTreeDnDListener
 {
 	private TreeRiscos tree;
 	
@@ -24,6 +23,7 @@ public class DnDRiscosListener implements DropTargetListener
 	
 	public DnDRiscosListener( TreeRiscos tree )
 	{
+		super( tree );
 		this.tree = tree;
 	}
 	
@@ -39,17 +39,12 @@ public class DnDRiscosListener implements DropTargetListener
 		}
 	}
 
-	@Override
-	public void dragExit(DropTargetEvent dte) 
-	{
-	}
-
 	@Override
 	public void dragOver( DropTargetDragEvent dtde ) 
 	{
-		Point pt = dtde.getLocation();
-		tree.autoscroll( pt );
+		super.dragOver( dtde );
 		
+		Point pt = dtde.getLocation();
 		if ( drag )
 		{
 			TreePath sourcePath = tree.getClosestPathForLocation( pt.x, pt.y );
@@ -134,11 +129,7 @@ public class DnDRiscosListener implements DropTargetListener
 			}
 		}
 	}
-
-	@Override
-	public void dropActionChanged(DropTargetDragEvent dtde) 
-	{
-	}
+	
 	
 	private void moveMedida( DefaultMutableTreeNode destinationNode, DefaultMutableTreeNode sourceNode, Object sourceObject, HsRiscoData destRisco )
 	{
diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/TreeRiscos.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/TreeRiscos.java
index 996b4d08..d4e41c75 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/TreeRiscos.java
+++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/TreeRiscos.java
@@ -8,16 +8,15 @@ import siprp.data.outer.HsRiscoData;
 import siprp.data.outer.HsRiscoMedidaData;
 import siprp.data.outer.HsRiscoTemaData;
 
-import leaf.ui.DraggableLeafTree;
+import com.evolute.swing.tree.EvoDraggableTree;
 
-public class TreeRiscos extends DraggableLeafTree 
+public class TreeRiscos extends EvoDraggableTree 
 {
 	private static final long serialVersionUID = 1L;
 
 	public TreeRiscos( TreeModel model )
 	{
-		super( model );
-		
+		super( model );		
 	}
 
 	@Override
@@ -43,4 +42,5 @@ public class TreeRiscos extends DraggableLeafTree
 		Object object = getSelectedObject();
 		return object == null ? null : ((object instanceof HsRiscoMedidaData) ? (HsRiscoMedidaData) object : null);
 	}
+	
 }