Moved RouteGraphConnectionClass to org.simantics.g2d.elementclass

[simantics/platform.git] / bundles / org.simantics.modeling / src / org / simantics / modeling / typicals / TypicalUtil.java

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/TypicalUtil.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/TypicalUtil.java
index 3016311ff9c0411be3eb22cb8b11ab6a440ad960..01960ba1ddfad60a11786a396642a6017f6a4577 100644 (file)
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/TypicalUtil.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/TypicalUtil.java
@@ -21,6 +21,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.simantics.NameLabelMode;
 import org.simantics.NameLabelUtil;
 import org.simantics.Simantics;
@@ -70,7 +71,6 @@ import org.simantics.scl.runtime.function.Function2;
 import org.simantics.scl.runtime.function.Function4;
 import org.simantics.structural.stubs.StructuralResource2;
 import org.simantics.structural2.utils.StructuralUtils;
-import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.ui.dialogs.ShowMessage;
 
@@ -169,7 +169,7 @@ public class TypicalUtil {
                CommonDBUtils.selectClusterSet(graph, target);
                 SimanticsClipboardImpl clipboard = new SimanticsClipboardImpl();
                 CopyHandler ch = new TypicalCompositeCopyHandler(template.getResource());
-                ch.copyToClipboard(graph, clipboard);
+                ch.copyToClipboard(graph, clipboard, new NullProgressMonitor());
 
                 Map<String,Object> hints = Collections.singletonMap(ClipboardUtils.HINT_TARGET_RESOURCE, target);
 
@@ -260,7 +260,7 @@ public class TypicalUtil {
             if (excludedComponents != null && excludedComponents.contains(component))
                 continue;
             try {
-                String renamed = ComponentNamingUtil.findFreshInstanceName(graph, SimanticsUI.getProject(), configurationRoot, typicalCompositeInstance, component);
+                String renamed = ComponentNamingUtil.findFreshInstanceName(graph, Simantics.getProject(), configurationRoot, typicalCompositeInstance, component);
                 if (DEBUG)
                     System.out.println("Typicals: renamed " + entry.getKey() + " -> " + renamed);
                 graph.claimLiteral(entry.getValue(), L0.HasName, L0.NameOf, renamed, Bindings.STRING);