From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 24 Mar 2011 00:09:16 +0000 (+0000)
Subject: * Implemented unique and automatic local diagram flag labeling.
X-Git-Tag: 2011-04-05-db-merge-trunk~1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=4d7d550d9bb30def5d30bc559823877493abcbf5;p=simantics%2Fsysdyn.git

* Implemented unique and automatic local diagram flag labeling.
* Added a preference page for configuring a project-wide default setting for the currently used labeling scheme

See FlagLabelingScheme, Splitter and ConnectionBuilder for implementation and use.

fixes #1518
fixes #1656
fixes #1643

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@20205 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectionBuilder.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectionBuilder.java
index ed27b294..5d48050f 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectionBuilder.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectionBuilder.java
@@ -108,7 +108,7 @@ public class SysdynConnectionBuilder extends ConnectionBuilder{
         if (startTerminal != null) {
             startConnector = createConnectorForNode(graph, connection, startTerminal, EdgeEnd.Begin, judgment);
         } else if (createFlags) {
-            startFlag = createFlag(graph, connection, EdgeEnd.Begin, controlPoints.getFirst(), FlagClass.Type.In);
+            startFlag = createFlag(graph, connection, EdgeEnd.Begin, controlPoints.getFirst(), FlagClass.Type.In, "");
 			ArrayList<Terminal> terminals = new ArrayList<Terminal>();
 			ElementUtils.getTerminals(startFlag, terminals, false);
 			Terminal st = terminals.get(1);
@@ -122,7 +122,7 @@ public class SysdynConnectionBuilder extends ConnectionBuilder{
         	if(createValve)
                 endFlag = createValveElement(graph, connection, EdgeEnd.End, controlPoints.getLast());
         	else
-        		endFlag = createFlag(graph, connection, EdgeEnd.End, controlPoints.getLast(), FlagClass.Type.Out);
+        		endFlag = createFlag(graph, connection, EdgeEnd.End, controlPoints.getLast(), FlagClass.Type.Out, "");
 			ArrayList<Terminal> terminals = new ArrayList<Terminal>();
 			ElementUtils.getTerminals(endFlag, terminals, false);
 			Terminal et = terminals.get(0);