From 3583a0b838febb293cbbcb4be2e619e11cf6ca57 Mon Sep 17 00:00:00 2001
From: luukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 22 Feb 2011 16:54:24 +0000
Subject: [PATCH] Added a relation for linking source and destination model

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@19817 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.interop/META-INF/MANIFEST.MF     |   3 ++-
 org.simantics.interop/graph.tg                 | Bin 697 -> 862 bytes
 org.simantics.interop/graph/Interop.pgraph     |   8 ++++----
 .../interop/issues/AbstractIssue.java          |  16 ++++++++++++----
 .../interop/stubs/InteropResource.java         |  17 ++++++-----------
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/org.simantics.interop/META-INF/MANIFEST.MF b/org.simantics.interop/META-INF/MANIFEST.MF
index ca01362..0033030 100644
--- a/org.simantics.interop/META-INF/MANIFEST.MF
+++ b/org.simantics.interop/META-INF/MANIFEST.MF
@@ -18,4 +18,5 @@ Require-Bundle: org.eclipse.ui,
  org.simantics.layer0;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.simantics.interop.issues
+Export-Package: org.simantics.interop.issues,
+ org.simantics.interop.stubs
diff --git a/org.simantics.interop/graph.tg b/org.simantics.interop/graph.tg
index cb77177e31da05d4c0db4628e43127cc6f24c6ba..e136802731656e653d0fb7cc468ade063d2b520b 100644
GIT binary patch
literal 862
zcmZ`%U2oGc6iwTFHCfhnY~zK007T<A01}ZV6}6LicH6rVNbSgWR{HDV+}nhX2P_@g
z_uS*-Yx^caKf=P2Go9ViN7HFP4uY)Sk@mH($)(948>fSe6+3#YH55kYgH5<H#-HV(
zR(pz(4E?c{Mf&-dC#zL+7R9ZyI0}w`<>|6z+mk9vD}CM*1)1~8(;iz~icLZMteWn>
zRYsCcM}38_G2ixUOe5hJhr^+C^<Lq^TUQ$Ugj6`;d@g63_Wg(Q4spR`IQ^pBT3!p$
zLa0knpUC-IE3O=TCVWxtTVwrwy|Kz3L67;wQFgD6Wbb;{Yv#tYb=Q)$)QH3K5nLpR
ztkSr$-jZ;MaC4lu8osPi&Ov?4nIx(7Gg(Ji&qX@z3EBNhsGO@+UOnJfpt}+>UVB?>
zzIrY(p8Y%7+Ou_hVwT#Q#ys&oZcav0Gk>nQPlcRlIzVwLL9y;O|J><9=;Zt&Ga(k0
z`$p<#b6oKQ(C)#&V#29W{?(cvwDtXKy#cpif8ZLJ0Vxpu#=v|96u`?o$MYV%Hv_n7
sZ-5IR1h^x)HQ0;e!H@fw>tO!fTQtXuR;jr&O<OwOZCu&+%J46L0D~l^;Q#;t

literal 697
zcmZ`%VNb#^5FG;B9HQ_$)CGTonz)2y2K)nM99XlpOWT3`dc9Xy@rzBm?cTk2y?b2}
zVU2iC4O!ipiXL^R+(i^+a!bldC&{LXr!g3%fd<Bwc2Y4zs|g4wGg@iw&h(KI4aLCS
zsr4Tqrq7>_j1u*k7`MXkaa{FR;+bWO^2{7VSEycx$gj*g;izG$P0?R`5Ow!&$77#O
z2ff(8=KP$U0pxssemov?D;vQkR5sUUkNJkkO?)4^y?@9T89;Af(X`sQrQ8@{PUvL-
zZnhLBG7C_zfgv$@5%x(q@y4E91u*HA7|pY?Lh*2_qH+fZJ(iZr>00kkHvyTfyOs>x
zEqAzuA6lW_$w+5mut#Qm<SN{7Ev&`J1EiBe9mrU^4Ah~b<1_^E+8L?#L&SdcSEE0u
za+n7tQr_tJix)(&18tx`j0R^y-v0+2<J6!<P1LyKeajyIaa`iEb(>q)ZEW6K9%lFk
DB)f)I

diff --git a/org.simantics.interop/graph/Interop.pgraph b/org.simantics.interop/graph/Interop.pgraph
index 8342860..4a6fc85 100644
--- a/org.simantics.interop/graph/Interop.pgraph
+++ b/org.simantics.interop/graph/Interop.pgraph
@@ -5,9 +5,9 @@ PROJ = <http://www.simantics.org/Project-1.0>
 INTEROP = <http://www.simantics.org/Interop-1.0> : L0.Ontology
     L0.HasResourceClass "org.simantics.interop.stubs.InteropResource"
     @L0.new
-    
-//INTEROP.InteropFeature : PROJ.Feature
-//   L0.HasDescription "Interop feature."
    
    
-INTEROP.ImportLibrary <T L0.Library
\ No newline at end of file
+INTEROP.ImportLibrary <T L0.Library
+
+INTEROP.HasSource <R L0.IsWeaklyRelatedTo
+    L0.InverseOf INTEROP.HasDestination <R L0.IsWeaklyRelatedTo
diff --git a/org.simantics.interop/src/org/simantics/interop/issues/AbstractIssue.java b/org.simantics.interop/src/org/simantics/interop/issues/AbstractIssue.java
index ae14eed..01ebb02 100644
--- a/org.simantics.interop/src/org/simantics/interop/issues/AbstractIssue.java
+++ b/org.simantics.interop/src/org/simantics/interop/issues/AbstractIssue.java
@@ -24,9 +24,12 @@ public abstract class AbstractIssue implements Issue{
 		Display.getDefault().asyncExec(new Runnable() {
 			@Override
 			public void run() {
-				for (IssueListener l : listeners) {
-					l.updated(AbstractIssue.this);
+				synchronized (listeners) {
+					for (IssueListener l : listeners) {
+						l.updated(AbstractIssue.this);
+					}	
 				}
+				
 			}
 		});
 	}
@@ -40,18 +43,23 @@ public abstract class AbstractIssue implements Issue{
 				for (IssueListener l : list) {
 					l.disposed(AbstractIssue.this);
 				}
+				listeners.clear();
 			}
 		});
 	}
 	
 	@Override
 	public void addListener(IssueListener listener) {
-		listeners.add(listener);
+		synchronized(listeners) {
+			listeners.add(listener);
+		}
 	}
 	
 	@Override
 	public void removeListener(IssueListener listener) {
-		listeners.remove(listener);
+		synchronized(listeners) {
+			listeners.remove(listener);
+		}
 	}
 	
 	@Override
diff --git a/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java b/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java
index ffa281f..a2b7f14 100644
--- a/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java
+++ b/org.simantics.interop/src/org/simantics/interop/stubs/InteropResource.java
@@ -1,14 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
 package org.simantics.interop.stubs;
 
 import org.simantics.db.Resource;
@@ -19,9 +8,13 @@ import org.simantics.db.exception.DatabaseException;
 
 public class InteropResource {
     
+    public final Resource HasDestination;
+    public final Resource HasSource;
     public final Resource ImportLibrary;
         
     public static class URIs {
+        public static final String HasDestination = "http://www.simantics.org/Interop-1.0/HasDestination";
+        public static final String HasSource = "http://www.simantics.org/Interop-1.0/HasSource";
         public static final String ImportLibrary = "http://www.simantics.org/Interop-1.0/ImportLibrary";
     }
     
@@ -35,6 +28,8 @@ public class InteropResource {
     }
     
     public InteropResource(ReadGraph graph) {
+        HasDestination = getResourceOrNull(graph, URIs.HasDestination);
+        HasSource = getResourceOrNull(graph, URIs.HasSource);
         ImportLibrary = getResourceOrNull(graph, URIs.ImportLibrary);
     }
     
-- 
2.45.2