[jbosstools-commits] JBoss Tools SVN: r9073 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: figures and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: dazarov
Date: 2008-07-04 07:47:33 -0400 (Fri, 04 Jul 2008)
New Revision: 9073

Modified:
   trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java
   trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1189

Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java	2008-07-04 11:20:09 UTC (rev 9072)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java	2008-07-04 11:47:33 UTC (rev 9073)
@@ -13,8 +13,6 @@
 import java.beans.PropertyChangeListener;
 import java.util.List;
 
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.FigureUtilities;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
@@ -23,20 +21,13 @@
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.ConnectionEditPart;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gef.EditPartListener;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DropRequest;
 import org.eclipse.swt.accessibility.AccessibleControlEvent;
 import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
 import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
-import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure;
-import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
 import org.jboss.tools.seam.ui.pages.editor.figures.ParamFigure;
 
 public class ParamEditPart extends PagesEditPart implements PropertyChangeListener, EditPartListener, Adapter {
@@ -70,30 +61,13 @@
 	}
 
 	public void selectedStateChanged(EditPart editpart) {
-		if (this.getSelected() == EditPart.SELECTED_PRIMARY) {
-			((PagesDiagramEditPart) ParamEditPart.this.getParent())
-					.setToFront(this);
-
-		}
+		fig.repaint();
 	}
 
 	public boolean isGroupListenerEnable() {
 		return true;
 	}
 
-
-
-	private void refreshTargetLink(Link link) {
-		if (link == null)
-			return;
-		ParamEditPart gep = (ParamEditPart) getViewer().getEditPartRegistry()
-				.get(link.getToElement());
-		if (gep == null)
-			return;
-		gep.refreshTargetConnections();
-	}
-
-
 	protected AccessibleEditPart createAccessible() {
 		return new AccessibleGraphicalEditPart() {
 
@@ -179,6 +153,7 @@
 		if (isActive())
 			return;
 		((Notifier) getModel()).eAdapters().add(this);
+		addEditPartListener(this);
 		super.activate();
 	}
 	
@@ -186,6 +161,7 @@
 		if (!isActive())
 			return;
 		((Notifier) getModel()).eAdapters().remove(this);
+		removeEditPartListener(this);
 		super.deactivate();
 	}
 	

Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java	2008-07-04 11:20:09 UTC (rev 9072)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java	2008-07-04 11:47:33 UTC (rev 9073)
@@ -10,10 +10,12 @@
  ******************************************************************************/ 
 package org.jboss.tools.seam.ui.pages.editor.figures;
 
+import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.EditPart;
 import org.eclipse.gef.handles.HandleBounds;
 import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param;
 import org.jboss.tools.seam.ui.pages.editor.edit.ParamEditPart;
@@ -64,6 +66,15 @@
 		Rectangle r = getBounds().getCopy();
 		g.translate(r.getLocation());
 		
+		if (editPart.getSelected() == EditPart.SELECTED_PRIMARY
+				|| editPart.getSelected() == EditPart.SELECTED) {
+			    g.setBackgroundColor(ColorConstants.white);
+			    g.fillRectangle(1, 1, r.width-2, r.height-2);
+			    
+		} else {
+		    g.setBackgroundColor(lightGrayColor);
+		    g.fillRectangle(1, 1, r.width-2, r.height-2);
+		}
 		String name;
 		if(param.getName() != null){
 			name = dottedString(param.getName(), getTextWidth()-getTextInset(), nameParamFont);