From: luukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 22 Feb 2011 16:54:24 +0000 (+0000)
Subject: Added a relation for linking source and destination model
X-Git-Tag: v1.31.0~129
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3583a0b838febb293cbbcb4be2e619e11cf6ca57;p=simantics%2Finterop.git

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
---

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 cb77177..e136802 100644
Binary files a/org.simantics.interop/graph.tg and b/org.simantics.interop/graph.tg differ
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);
     }