From 14539f0379b4be510fbd56f8f2174824c8e947f0 Mon Sep 17 00:00:00 2001
From: niemisto <niemisto@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 19 Nov 2009 10:41:15 +0000
Subject: [PATCH] text in valve element

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@13147 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.sysdyn.ui/META-INF/MANIFEST.MF  |   4 +-
 org.simantics.sysdyn.ui/plugin.xml            |  21 ++-
 .../simantics/sysdyn/ui/actions/Connect.java  |   4 +-
 .../sysdyn/ui/elements/ValveElement.java      |   9 +-
 .../sysdyn/ui/elements/ValveElementOld.java   |  73 +++++++++
 .../ModelicaSourceViewerConfiguration.java    | 143 ++++++++++++++++++
 .../sysdyn/ui/modelica/ModelicaView.java      |  30 ----
 .../ui/modelica/SysdynModelicaEditor.java     |  85 +++++++++++
 .../TextEditorActionBarContributor.java       |  11 ++
 .../representation/LoadRepresentation.java    |  27 ++++
 .../sysdyn/representation/SysdynSchema.java   |  31 ++++
 11 files changed, 394 insertions(+), 44 deletions(-)
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveElementOld.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaSourceViewerConfiguration.java
 delete mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaView.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/SysdynModelicaEditor.java
 create mode 100644 org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/TextEditorActionBarContributor.java
 create mode 100644 org.simantics.sysdyn/src/org/simantics/sysdyn/representation/LoadRepresentation.java
 create mode 100644 org.simantics.sysdyn/src/org/simantics/sysdyn/representation/SysdynSchema.java

diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index 6bd0fbf5..e1cedbe8 100644
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -16,6 +16,8 @@ Require-Bundle: org.simantics.h2d;bundle-version="1.0.0",
  org.simantics.objmap;bundle-version="0.1.0",
  org.simantics.sysdyn;bundle-version="1.0.0",
  org.simantics.project;bundle-version="1.0.0",
- org.apache.log4j;bundle-version="1.2.15"
+ org.apache.log4j;bundle-version="1.2.15",
+ org.eclipse.jface.text;bundle-version="3.5.0",
+ org.eclipse.ui.editors;bundle-version="3.5.0"
 Bundle-Activator: org.simantics.sysdyn.ui.Activator
 Bundle-ActivationPolicy: lazy
diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index 6092710c..1c9024bd 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -7,7 +7,14 @@
             class="org.simantics.sysdyn.ui.editor.SysdynDiagramEditor"
             default="false"
             id="org.simantics.sysdyn.ui.diagramEditor"
-            name="Sysdyn diagram editor">
+            name="System dynamic diagram editor">
+      </editor>
+      <editor
+            class="org.simantics.sysdyn.ui.modelica.SysdynModelicaEditor"
+            contributorClass="org.simantics.sysdyn.ui.modelica.TextEditorActionBarContributor"
+            default="false"
+            id="org.simantics.sysdyn.ui.modelicaEditor"
+            name="Sysdyn Modelica editor">
       </editor>
    </extension>
    <extension
@@ -17,6 +24,11 @@
             priority="3"
             type_uris="http://www.simantics.org/Sysdyn#Configuration">
       </adapter>
+      <adapter
+            editorId="org.simantics.sysdyn.ui.modelicaEditor"
+            priority="2"
+            type_uris="http://www.simantics.org/Sysdyn#Configuration">
+      </adapter>
    </extension>
    <extension
          point="org.eclipse.ui.views">
@@ -24,13 +36,6 @@
             id="org.simantics.sysdyn.ui.category"
             name="System Dynamics">
       </category>
-      <view
-            category="org.simantics.sysdyn.ui.category"
-            class="org.simantics.sysdyn.ui.modelica.ModelicaView"
-            id="org.simantics.sysdyn.ui.modelica.view"
-            name="Modelica View"
-            restorable="true">
-      </view>
       <view
             category="org.simantics.sysdyn.ui.category"
             class="org.simantics.sysdyn.ui.equation.EquationView"
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/actions/Connect.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/actions/Connect.java
index 6354acda..8b793f4e 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/actions/Connect.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/actions/Connect.java
@@ -81,7 +81,7 @@ public class Connect extends DragEventHandler {
 						0.5 * (fromOrigo.getY() + toOrigo.getY())
 						);
 				editor.getDiagram().addElement(new FlowElement(from, (ValveElement)newElement));
-				editor.getDiagram().addElement(new FlowElement(to, (ValveElement)newElement));
+				editor.getDiagram().addElement(new FlowElement(to, (ValveElement)newElement));				
 			}
 			else if(from instanceof ValveElement && to instanceof AuxiliaryElement)
 				newElement = new DependencyElement(to, from);
@@ -90,6 +90,8 @@ public class Connect extends DragEventHandler {
 			else 
 				newElement = new DependencyElement(from, to);
 			editor.getDiagram().addElement(newElement);
+			if(newElement instanceof ValveElement)
+			    ((ValveElement)newElement).beginRenameAction(editor);
 		}
 		
 		from = null;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveElement.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveElement.java
index d2fb9a67..e93751c0 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveElement.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveElement.java
@@ -11,7 +11,7 @@ import org.simantics.objmap.annotations.GraphType;
 import org.simantics.scenegraph.g2d.G2DParentNode;
 
 @GraphType("http://www.simantics.org/Sysdyn#Valve")
-public class ValveElement extends RectangularElement implements Connectable, Rotatable {
+public class ValveElement extends TextElement implements Rotatable {
 	 
 	public static final double VALVE_SIZE = 5.0;
 	
@@ -32,17 +32,17 @@ public class ValveElement extends RectangularElement implements Connectable, Rot
 		valveNode.setColor(Color.BLACK);
 		valveNode.setScaleStroke(true);
 		valveNode.setStroke(new BasicStroke(1));
-		update();
+		super.init(parent);
 	}
 
 	@Override
 	public void remove() {
 		valveNode.remove();
+		super.remove();
 	}
 	
 	@Override
-	protected void update() {
-		bounds.setFrame(posX-VALVE_SIZE, posY-VALVE_SIZE, 2.0*VALVE_SIZE, 2.0*VALVE_SIZE);
+	protected void update() {		
 		Path2D path = new Path2D.Double();
 		path.moveTo(posX-VALVE_SIZE, posY-VALVE_SIZE);
 		if(rotated) {
@@ -57,6 +57,7 @@ public class ValveElement extends RectangularElement implements Connectable, Rot
 		path.closePath();
 		valveNode.setShape(path);
 	    super.update();
+	    bounds.setFrame(posX-VALVE_SIZE, posY-VALVE_SIZE, 2.0*VALVE_SIZE, 2.0*VALVE_SIZE);
 	}
 
 	@Override
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveElementOld.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveElementOld.java
new file mode 100644
index 00000000..e70e1b1b
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveElementOld.java
@@ -0,0 +1,73 @@
+package org.simantics.sysdyn.ui.elements;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.geom.Path2D;
+
+import org.simantics.h2d.element.handler.Connectable;
+import org.simantics.h2d.element.handler.Rotatable;
+import org.simantics.h2d.node.ShapeNode;
+import org.simantics.objmap.annotations.GraphType;
+import org.simantics.scenegraph.g2d.G2DParentNode;
+
+@GraphType("http://www.simantics.org/Sysdyn#Valve")
+public class ValveElementOld extends RectangularElement implements Connectable, Rotatable {
+	 
+	public static final double VALVE_SIZE = 5.0;
+	
+    ShapeNode valveNode;
+    boolean rotated = false;
+    
+	public ValveElementOld() {	
+	}
+	
+	public ValveElementOld(double x, double y) {
+	    this.posX = x;
+	    this.posY = y; 
+	}
+
+	@Override
+	public void init(G2DParentNode parent) {
+		valveNode = parent.addNode(ShapeNode.class);
+		valveNode.setColor(Color.BLACK);
+		valveNode.setScaleStroke(true);
+		valveNode.setStroke(new BasicStroke(1));
+		update();
+	}
+
+	@Override
+	public void remove() {
+		valveNode.remove();
+	}
+	
+	@Override
+	protected void update() {
+		bounds.setFrame(posX-VALVE_SIZE, posY-VALVE_SIZE, 2.0*VALVE_SIZE, 2.0*VALVE_SIZE);
+		Path2D path = new Path2D.Double();
+		path.moveTo(posX-VALVE_SIZE, posY-VALVE_SIZE);
+		if(rotated) {
+			path.lineTo(posX-VALVE_SIZE, posY+VALVE_SIZE);
+			path.lineTo(posX+VALVE_SIZE, posY-VALVE_SIZE);
+		}
+		else {			
+			path.lineTo(posX+VALVE_SIZE, posY-VALVE_SIZE);
+			path.lineTo(posX-VALVE_SIZE, posY+VALVE_SIZE);			
+		}
+		path.lineTo(posX+VALVE_SIZE, posY+VALVE_SIZE);
+		path.closePath();
+		valveNode.setShape(path);
+	    super.update();
+	}
+
+	@Override
+	public void rotate(int amount) {
+		if((amount & 1) == 1) {
+			rotated = !rotated;
+			update();
+		}
+	}
+
+	public boolean isRotated() {
+		return rotated;
+	}
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaSourceViewerConfiguration.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaSourceViewerConfiguration.java
new file mode 100644
index 00000000..11f32ea8
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaSourceViewerConfiguration.java
@@ -0,0 +1,143 @@
+package org.simantics.sysdyn.ui.modelica;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.presentation.IPresentationReconciler;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.ICharacterScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+
+public class ModelicaSourceViewerConfiguration extends SourceViewerConfiguration {
+
+	public IPresentationReconciler getPresentationReconciler(
+			ISourceViewer sourceViewer) {
+		PresentationReconciler pr = new PresentationReconciler();
+		DefaultDamagerRepairer ddr = new DefaultDamagerRepairer(
+				new RuleBasedScanner() {														
+					{
+						setRules(new IRule[] {new IRule() {
+
+							@Override
+							public IToken evaluate(ICharacterScanner scanner) {
+								int ch;
+								try {
+									scanner.unread();
+									ch = scanner.read();
+								} catch (Throwable t) {
+									ch = -1;
+								}
+								if (ch <= 0 || !isIdentifierChar((char) ch)) {
+									ch = scanner.read();
+									if(isIdentifierChar((char)ch)) {
+										StringBuilder b = new StringBuilder();
+										do {
+											b.append((char)ch);
+											ch = scanner.read();
+										} while(isIdentifierChar((char) ch));
+										String str = b.toString();
+										if(keywords.contains(str))
+											return getModelicaKeywordToken();
+									}
+									scanner.unread();
+								}
+								return Token.UNDEFINED;
+							}									
+							
+						}});
+					}							
+				}
+			);
+		pr.setRepairer(ddr, IDocument.DEFAULT_CONTENT_TYPE);
+		pr.setDamager(ddr, IDocument.DEFAULT_CONTENT_TYPE);
+		return pr;
+	}
+	
+	static boolean isIdentifierChar(char c) {
+		return 
+			(c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') 
+		 || (c >= '0' && c <= '9') || c == '_';
+	}
+	
+	static final Set<String> keywords = new HashSet<String>();
+	
+	static {
+		keywords.add("within");
+		keywords.add("final");
+		keywords.add("public");
+		keywords.add("protected");
+		keywords.add("connect");
+		keywords.add("when");
+		keywords.add("then");
+		keywords.add("elsewhen");
+		keywords.add("if");
+		keywords.add("end");
+		keywords.add("elseif");
+		keywords.add("else");
+		keywords.add("for");
+		keywords.add("while");
+		keywords.add("loop");
+		keywords.add("der");
+		keywords.add("enumeration");
+		keywords.add("extends");
+		keywords.add("class");
+		keywords.add("partial");
+		keywords.add("encapsulated");
+		keywords.add("model");
+		keywords.add("record");
+		keywords.add("block");
+		keywords.add("expandable");
+		keywords.add("connector");
+		keywords.add("type");
+		keywords.add("package");
+		keywords.add("function");
+		keywords.add("import");
+		keywords.add("external");
+		keywords.add("constrainedby");
+		keywords.add("redeclare");
+		keywords.add("replaceable");
+		keywords.add("flow");
+		keywords.add("discrete");
+		keywords.add("parameter");
+		keywords.add("constant");
+		keywords.add("input");
+		keywords.add("output");
+		keywords.add("annotation");
+		keywords.add("false");
+		keywords.add("true");
+		keywords.add("each");
+		keywords.add("initial");
+		keywords.add("algorithm");
+		keywords.add("equation");
+		keywords.add("or");
+		keywords.add("and");
+		keywords.add("not");
+		keywords.add("break");
+		keywords.add("return");		
+	}
+
+	static IToken modelicaKeywordToken = null;
+	public IToken getModelicaKeywordToken() {
+		if(modelicaKeywordToken == null) {
+			modelicaKeywordToken = 
+				new Token(
+						new TextAttribute(
+								new Color(null, 127, 0, 85),
+								new Color(null, 255, 255, 255),
+								SWT.BOLD
+								));
+		}
+		return modelicaKeywordToken;
+	}
+	
+}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaView.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaView.java
deleted file mode 100644
index fb884168..00000000
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/ModelicaView.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.simantics.sysdyn.ui.modelica;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.part.ViewPart;
-
-public class ModelicaView extends ViewPart implements ISelectionListener {
-    
-    @Override    
-    public void createPartControl(Composite parent) {
-        getSite().getPage().addPostSelectionListener(this);
-        new Label(parent, SWT.NONE).setText("Hello World!");
-    }   
-
-    @Override
-    public void setFocus() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-        System.out.println("selection changed");
-    }
-
-}
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/SysdynModelicaEditor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/SysdynModelicaEditor.java
new file mode 100644
index 00000000..200a4806
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/SysdynModelicaEditor.java
@@ -0,0 +1,85 @@
+package org.simantics.sysdyn.ui.modelica;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.operation.IRunnableContext;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.PaintManager;
+import org.eclipse.jface.text.source.AnnotationModel;
+import org.eclipse.jface.text.source.AnnotationPainter;
+import org.eclipse.jface.text.source.DefaultCharacterPairMatcher;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.MatchingCharacterPainter;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.ui.texteditor.AbstractDocumentProvider;
+
+
+public class SysdynModelicaEditor extends TextEditor {
+
+    AnnotationModel annotationModel = new AnnotationModel();
+    AnnotationPainter apainter;
+    
+    public SysdynModelicaEditor() {
+        super();
+        showOverviewRuler();
+        setDocumentProvider(new AbstractDocumentProvider() {
+
+            @Override
+            protected IAnnotationModel createAnnotationModel(Object element)
+                    throws CoreException {
+                return annotationModel;
+            }
+
+            @Override
+            protected IDocument createDocument(Object element)
+                    throws CoreException {
+                return new Document((String)getEditorInput().getAdapter(String.class));
+            }
+
+            @Override
+            protected void doSaveDocument(IProgressMonitor monitor,
+                    Object element, IDocument document, boolean overwrite)
+                    throws CoreException {
+            }
+
+            @Override
+            protected IRunnableContext getOperationRunner(
+                    IProgressMonitor monitor) {
+                return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+            }
+            
+            @Override
+            public boolean isModifiable(Object element) {
+                return false;
+            }
+            
+            @Override
+            public boolean isReadOnly(Object element) {
+                return true;
+            }
+            
+        }); 
+        
+        setSourceViewerConfiguration(new ModelicaSourceViewerConfiguration());
+                
+    }
+    
+    @Override
+    protected void createActions() {
+        super.createActions();
+        
+        PaintManager paintManager = new PaintManager(getSourceViewer());
+        MatchingCharacterPainter matchingCharacterPainter = new MatchingCharacterPainter(getSourceViewer(),
+                new DefaultCharacterPairMatcher( new char[] {'(', ')', '{', '}', '[', ']'} ));
+        matchingCharacterPainter.setColor(new Color(Display.getCurrent(), new RGB(160, 160, 160)));
+        paintManager.addPainter(matchingCharacterPainter);
+    }
+    
+    
+}
+
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/TextEditorActionBarContributor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/TextEditorActionBarContributor.java
new file mode 100644
index 00000000..f03ab627
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/modelica/TextEditorActionBarContributor.java
@@ -0,0 +1,11 @@
+package org.simantics.sysdyn.ui.modelica;
+
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+public class TextEditorActionBarContributor extends EditorActionBarContributor {
+
+	public TextEditorActionBarContributor() {
+		// TODO Auto-generated constructor stub
+	}
+
+}
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/LoadRepresentation.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/LoadRepresentation.java
new file mode 100644
index 00000000..c02ac45a
--- /dev/null
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/LoadRepresentation.java
@@ -0,0 +1,27 @@
+package org.simantics.sysdyn.representation;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.Session;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.request.Read;
+import org.simantics.objmap.IMapping;
+import org.simantics.objmap.Mappings;
+
+public class LoadRepresentation {
+
+    public static Configuration load(Session session, final Resource configuration) throws DatabaseException {
+        return session.syncRequest(new Read<Configuration>() {
+
+            @Override
+            public Configuration perform(ReadGraph graph)
+                    throws DatabaseException {
+                SysdynSchema schema = new SysdynSchema(graph);
+                IMapping mapping = Mappings.createWithoutListening(schema);
+                return (Configuration)mapping.map(graph, configuration);                
+            }
+            
+        });
+    }
+    
+}
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/SysdynSchema.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/SysdynSchema.java
new file mode 100644
index 00000000..eccb7c9d
--- /dev/null
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/SysdynSchema.java
@@ -0,0 +1,31 @@
+package org.simantics.sysdyn.representation;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.objmap.schema.MappingSchemas;
+import org.simantics.objmap.schema.SimpleSchema;
+
+public class SysdynSchema extends SimpleSchema {
+    
+    public SysdynSchema(ReadGraph g) {        
+        try {
+            addLinkType(MappingSchemas.fromAnnotations(g, Auxiliary.class));
+            addLinkType(MappingSchemas.fromAnnotations(g, Cloud.class));
+            addLinkType(MappingSchemas.fromAnnotations(g, Configuration.class));
+            addLinkType(MappingSchemas.fromAnnotations(g, Dependency.class));
+            addLinkType(MappingSchemas.fromAnnotations(g, Flow.class));
+            addLinkType(MappingSchemas.fromAnnotations(g, Stock.class));
+            addLinkType(MappingSchemas.fromAnnotations(g, Valve.class));
+        } catch (DatabaseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (InstantiationException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }        
+    }
+
+}
-- 
2.47.1