RESOLVED - bug 200195: [pde viz] Investigate the use of the directed graph layout in Draw2D
https://bugs.eclipse.org/bugs/show_bug.cgi?id=200195
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath b/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath
index 039f2bb..6caf3e9 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="org.eclipse.draw2d_3.2.100.200708141030.jar"/>
- <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.core_0.5.0.200708141030.jar"/>
- <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.layouts_0.5.0.200708141030.jar"/>
+ <classpathentry exported="true" kind="lib" path="org.eclipse.draw2d_3.2.100.200708170620.jar"/>
+ <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.core_0.5.0.200708170620.jar"/>
+ <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/META-INF/MANIFEST.MF b/visualization/plugins/org.eclipse.pde.visualization.dependency/META-INF/MANIFEST.MF
index 909a371..8b06adc 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/META-INF/MANIFEST.MF
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
org.eclipse.core.resources
Eclipse-LazyStart: true
Bundle-ClassPath: .,
- org.eclipse.draw2d_3.2.100.200708141030.jar,
- org.eclipse.mylyn.zest.core_0.5.0.200708141030.jar,
- org.eclipse.mylyn.zest.layouts_0.5.0.200708141030.jar
+ org.eclipse.draw2d_3.2.100.200708170620.jar,
+ org.eclipse.mylyn.zest.core_0.5.0.200708170620.jar,
+ org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/build.properties b/visualization/plugins/org.eclipse.pde.visualization.dependency/build.properties
index 4529243..4da8bdc 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/build.properties
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/build.properties
@@ -2,9 +2,9 @@
plugin.xml,\
icons/,\
.,\
- org.eclipse.draw2d_3.2.100.200708141030.jar,\
- org.eclipse.mylyn.zest.core_0.5.0.200708141030.jar,\
- org.eclipse.mylyn.zest.layouts_0.5.0.200708141030.jar
+ org.eclipse.draw2d_3.2.100.200708170620.jar,\
+ org.eclipse.mylyn.zest.core_0.5.0.200708170620.jar,\
+ org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar
src.includes = src/,\
plugin.xml,\
META-INF/,\
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.100.200708141030.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.100.200708170620.jar
similarity index 90%
rename from visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.100.200708141030.jar
rename to visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.100.200708170620.jar
index ef1a63c..00c588a 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.100.200708141030.jar
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.100.200708170620.jar
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.200708141030.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.200708141030.jar
deleted file mode 100644
index 21d54a3..0000000
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.200708141030.jar
+++ /dev/null
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.200708170620.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.200708170620.jar
new file mode 100644
index 0000000..0291373
--- /dev/null
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.200708170620.jar
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.200708141030.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar
similarity index 79%
rename from visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.200708141030.jar
rename to visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar
index c481d65..2ac7846 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.200708141030.jar
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/PluginVisualizationView.java b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/PluginVisualizationView.java
index c267c2a..969538c 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/PluginVisualizationView.java
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/PluginVisualizationView.java
@@ -42,6 +42,7 @@
import org.eclipse.mylyn.zest.layouts.LayoutAlgorithm;
import org.eclipse.mylyn.zest.layouts.LayoutStyles;
import org.eclipse.mylyn.zest.layouts.algorithms.CompositeLayoutAlgorithm;
+import org.eclipse.mylyn.zest.layouts.algorithms.DirectedGraphLayoutAlgorithm;
import org.eclipse.mylyn.zest.layouts.algorithms.HorizontalShift;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.osgi.service.resolver.BundleSpecification;
@@ -68,8 +69,6 @@
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.part.ViewPart;
-import bin.org.eclipse.mylyn.zest.layouts.algorithms.TreeLayoutAlgorithm;
-
/**
* This sample class demonstrates how to plug-in a new workbench view. The view
* shows data obtained from the model. The sample creates a dummy model on the
@@ -142,8 +141,7 @@
viewer.setLabelProvider(this.currentLabelProvider);
viewer.setInput(null);
viewer.setConnectionStyle(ZestStyles.CONNECTIONS_DIRECTED);
- viewer.setLayoutAlgorithm(new CompositeLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING, new LayoutAlgorithm[] { new TreeLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING), new HorizontalShift(LayoutStyles.NO_LAYOUT_NODE_RESIZING) }));
- //viewer.setLayoutAlgorithm(new CompositeLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING, new LayoutAlgorithm[] { new DirectedGraphLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING), new HorizontalShift(LayoutStyles.NO_LAYOUT_NODE_RESIZING) }));
+ viewer.setLayoutAlgorithm(new CompositeLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING, new LayoutAlgorithm[] { new DirectedGraphLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING), new HorizontalShift(LayoutStyles.NO_LAYOUT_NODE_RESIZING) }));
viewer.addSelectionChangedListener(new ISelectionChangedListener() {