Removed graphviz dependency from org.simantics.browsing.ui.model

refs #7721

Change-Id: Ie4aec36287f8f37d11a75d560180350b283fbad4

diff --git a/bundles/org.simantics.browsing.ui.model/META-INF/MANIFEST.MF b/bundles/org.simantics.browsing.ui.model/META-INF/MANIFEST.MF
index 2562611bb2ff4eb5bde75da98e7ff8dc636d0dde..c3780130342f8115e80ce84b1333059592bf7c11 100644 (file)
--- a/bundles/org.simantics.browsing.ui.model/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.browsing.ui.model/META-INF/MANIFEST.MF
@@ -5,11 +5,6 @@ Bundle-SymbolicName: org.simantics.browsing.ui.model
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.simantics.browsing.ui.common;bundle-version="1.1.0",
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.simantics.browsing.ui.common;bundle-version="1.1.0",

- org.simantics.db.layer0;bundle-version="1.1.0",
- org.eclipse.jface;bundle-version="3.6.0",
- gnu.trove3;bundle-version="3.0.3",
- org.simantics.graphviz;bundle-version="1.1.0",
- org.simantics.graphviz.ui;bundle-version="1.1.0",

  org.simantics.ui;bundle-version="1.0.0",
  org.slf4j.api
 Export-Package: org.simantics.browsing.ui.model,
  org.simantics.ui;bundle-version="1.0.0",
  org.slf4j.api
 Export-Package: org.simantics.browsing.ui.model,

diff --git a/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/browsecontexts/BrowseContext.java b/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/browsecontexts/BrowseContext.java
index e57bfacca92d11b8b71d7eba4b2a8f1e0aa4c8e1..42ac584209e721dafcffc5d6b9a24e650445fde2 100644 (file)
--- a/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/browsecontexts/BrowseContext.java
+++ b/bundles/org.simantics.browsing.ui.model/src/org/simantics/browsing/ui/model/browsecontexts/BrowseContext.java
@@ -22,9 +22,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import java.util.Set;
 
 import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Event;

-import org.eclipse.swt.widgets.Shell;

 import org.simantics.browsing.ui.BuiltinKeys;
 import org.simantics.browsing.ui.CheckedState;
 import org.simantics.browsing.ui.NodeContext;
 import org.simantics.browsing.ui.BuiltinKeys;
 import org.simantics.browsing.ui.CheckedState;
 import org.simantics.browsing.ui.NodeContext;


@@ -63,9 +61,6 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.exception.ResourceNotFoundException;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.request.Read;
 import org.simantics.db.exception.ResourceNotFoundException;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.request.Read;

-import org.simantics.graphviz.Graph;
-import org.simantics.graphviz.Node;
-import org.simantics.graphviz.ui.GraphvizComponent;

 import org.simantics.scl.reflection.OntologyVersions;
 import org.simantics.viewpoint.ontology.ViewpointResource;
 import org.slf4j.Logger;
 import org.simantics.scl.reflection.OntologyVersions;
 import org.simantics.viewpoint.ontology.ViewpointResource;
 import org.slf4j.Logger;


@@ -469,36 +464,6 @@ public class BrowseContext {
             return tooltip;
         return null;
     }
             return tooltip;
         return null;
     }

-    
-    private Graph toGraph() {
-        Graph graph = new Graph();
-        new Node(graph, "Foo");
-        return graph;
-    }
-
-    @SuppressWarnings("unused")
-    private void visualize() {
-        final Graph graph = toGraph();
-                
-        // Show it
-        new Thread() {
-            public void run() {
-                final Display display = new Display();
-                final Shell shell = new Shell(display);
-
-                GraphvizComponent comp = new GraphvizComponent(shell, 0);
-                comp.setGraph(graph);
-
-                comp.setBounds(0, 0, 800, 600);
-                shell.pack();
-                shell.open ();
-                while (!shell.isDisposed()) {
-                    if (!display.readAndDispatch()) display.sleep();
-                }
-                display.dispose();
-            }
-        }.start();      
-    }

 
     @Override
     public int hashCode() {
 
     @Override
     public int hashCode() {