Attachment 79402 Details for Bug 130643 – Proposed Patch

[patch] Proposed Patch

130643.txt (text/plain), 2.43 KB, created by Carson Li

on 2007-09-28 10:39:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carson Li

Created: 2007-09-28 10:39:50 EDT

Size: 2.43 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.examples.runtime.diagram.logic
>Index: src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/CircuitCompartmentCanonicalEditPolicy.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.diagram.logic/src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/CircuitCompartmentCanonicalEditPolicy.java,v
>retrieving revision 1.8
>diff -u -r1.8 CircuitCompartmentCanonicalEditPolicy.java
>--- src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/CircuitCompartmentCanonicalEditPolicy.java	3 Oct 2006 14:40:40 -0000	1.8
>+++ src/org/eclipse/gmf/examples/runtime/diagram/logic/internal/editpolicies/CircuitCompartmentCanonicalEditPolicy.java	27 Sep 2007 20:15:12 -0000
>@@ -70,20 +70,27 @@
> 		ListIterator li = allChildren.listIterator();
> 		UniqueEList wires = new UniqueEList();
> 		while (li.hasNext()) {
>-			Object obj = li.next();
>+			Object obj = li.next();	
> 			if (obj instanceof Wire) {
>-				Wire wire = (Wire)obj;
>+				Wire wire = (Wire)obj;				
>                 if (isWirePartOfContainer(circuitElement, wire))
>-                    wires.add(wire);
>+                	//checks if the wire maps to the same circuit
>+                	if (wire.getSource().eContainer().equals(circuitElement)
>+                		&& (wire.getTarget().eContainer().equals(circuitElement))){               	
>+                     // do nothing
>+                	}
>+                	else{
>+                		wires.add(wire);                		
>+                	}
> 			}
>-		}
>-		
>+		}		
> 		return wires;
> 	}
>     
>     private boolean isWirePartOfContainer(Circuit circuitElement, Wire wire) {
>         if (EcoreUtil.isAncestor(circuitElement, wire.getSource()) &&
>                 EcoreUtil.isAncestor(circuitElement, wire.getTarget())) {
>+        	System.out.println("this one");
>                 return true;
>             }
>             else {
>@@ -91,6 +98,7 @@
>                     EcoreUtil.isAncestor(circuitElement, wire.getSource().eContainer())) ||
>                     (!wire.getTarget().eContainer().equals(circuitElement) &&
>                     EcoreUtil.isAncestor(circuitElement, wire.getTarget().eContainer()))) {
>+                	System.out.println("the other one");
>                     return true;
>                 }
>             }

Actions: View | Diff

Attachments on bug 130643: 79402