Attachment 80540 Details for Bug 206598 – Patch

[patch] Patch

associationpatch (text/plain), 4.64 KB, created by Bence Oláh

on 2007-10-17 06:36:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bence Oláh

Created: 2007-10-17 06:36:46 EDT

Size: 4.64 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ohf.h3et.mif.core
>Index: src/org/eclipse/ohf/h3et/mif/core/ssm/Association.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ohf/plugins/org.eclipse.ohf.h3et.mif.core/src/org/eclipse/ohf/h3et/mif/core/ssm/Association.java,v
>retrieving revision 1.6
>diff -u -r1.6 Association.java
>--- src/org/eclipse/ohf/h3et/mif/core/ssm/Association.java	8 Oct 2007 13:44:12 -0000	1.6
>+++ src/org/eclipse/ohf/h3et/mif/core/ssm/Association.java	17 Oct 2007 10:27:30 -0000
>@@ -86,8 +86,9 @@
> 	/**
> 	 * Returns the graphical information associated with this artefact.
> 	 * @return graphical information
>+	 * @throws H3ETException 
> 	 */
>-	public GraphicalInformation getGraphicalInformation();
>+	public GraphicalInformation getGraphicalInformation() throws H3ETException;
> 
> 
> 	public AssociationEndDerivationProvider[] getDerivationProviders();
>Index: src/org/eclipse/ohf/h3et/mif/core/ssm/graphicalinformation/AssociationGraphicalInformation.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ohf/plugins/org.eclipse.ohf.h3et.mif.core/src/org/eclipse/ohf/h3et/mif/core/ssm/graphicalinformation/AssociationGraphicalInformation.java,v
>retrieving revision 1.6
>diff -u -r1.6 AssociationGraphicalInformation.java
>--- src/org/eclipse/ohf/h3et/mif/core/ssm/graphicalinformation/AssociationGraphicalInformation.java	5 Oct 2007 08:14:09 -0000	1.6
>+++ src/org/eclipse/ohf/h3et/mif/core/ssm/graphicalinformation/AssociationGraphicalInformation.java	17 Oct 2007 10:27:30 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.ohf.h3et.mif.core.model.MIFStaticModel;
> import org.eclipse.ohf.h3et.mif.core.model.MIFStaticPackageDiagramGraphicInformation;
> import org.eclipse.ohf.h3et.mif.core.ssm.Artefact;
>+import org.eclipse.ohf.h3et.mif.core.ssm.Association;
> 
> /**
>  * /**
>@@ -31,7 +32,7 @@
> 	
> 	private GraphEdge graphEdge;
> 
>-	public AssociationGraphicalInformation(MIFStaticModel staticModel, Artefact artefact) {
>+	public AssociationGraphicalInformation(MIFStaticModel staticModel, Artefact artefact) throws H3ETException {
> 
> 		if (staticModel.hasGraphicRepresentations()) {
> 			
>@@ -47,13 +48,10 @@
> 					
> 					//iterate the associations to find the corresponding one based on the name
> 					for (MIFAssociationGraphicInformation information : associationList) {
>-						try {
>-							if (information.getRelationshipName().equals(artefact.getName()))
>+							if (information.getRelationshipName().equals(artefact.getName()) && 
>+									(information.getClassName().equals(((Association)artefact).getTarget().getName())) ||
>+									(information.getClassName().equals(((Association)artefact).getSource().getName())))
> 								loadFields(information);
>-						} catch (H3ETException e) {
>-							// TODO Auto-generated catch block
>-							e.printStackTrace();
>-						}
> 					}
> 				}
> 			}
>Index: src/org/eclipse/ohf/h3et/mif/core/ssm/impl/CloneClassImpl.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ohf/plugins/org.eclipse.ohf.h3et.mif.core/src/org/eclipse/ohf/h3et/mif/core/ssm/impl/CloneClassImpl.java,v
>retrieving revision 1.36
>diff -u -r1.36 CloneClassImpl.java
>--- src/org/eclipse/ohf/h3et/mif/core/ssm/impl/CloneClassImpl.java	10 Oct 2007 23:01:30 -0000	1.36
>+++ src/org/eclipse/ohf/h3et/mif/core/ssm/impl/CloneClassImpl.java	17 Oct 2007 10:27:30 -0000
>@@ -378,7 +378,6 @@
> 						//find the class where this class belongs to....
> 						if (classGraphicalInformation.getClassName().equals(mifFlatClass.getName())) {
> 							result.add(new ClassGraphicalInformation(classGraphicalInformation));
>-//							loadFields(classGraphicalInformation);
> 						}
> 					}
> 				}
>Index: src/org/eclipse/ohf/h3et/mif/core/ssm/impl/AssociationImpl.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ohf/plugins/org.eclipse.ohf.h3et.mif.core/src/org/eclipse/ohf/h3et/mif/core/ssm/impl/AssociationImpl.java,v
>retrieving revision 1.24
>diff -u -r1.24 AssociationImpl.java
>--- src/org/eclipse/ohf/h3et/mif/core/ssm/impl/AssociationImpl.java	10 Oct 2007 02:44:17 -0000	1.24
>+++ src/org/eclipse/ohf/h3et/mif/core/ssm/impl/AssociationImpl.java	17 Oct 2007 10:27:30 -0000
>@@ -469,7 +469,7 @@
> 	 * (non-Javadoc)
> 	 * @see org.eclipse.ohf.h3et.mif.core.ssm.IArtefact#getGraphicalInformation()
> 	 */
>-	public GraphicalInformation getGraphicalInformation() {
>+	public GraphicalInformation getGraphicalInformation() throws H3ETException {
> 		return new AssociationGraphicalInformation(model, this);
> 	}
>

Actions: View | Diff

Attachments on bug 206598: 80540 | 80649