RESOLVED - bug 197725: [pde viz] Nodes disappear when filter selected
https://bugs.eclipse.org/bugs/show_bug.cgi?id=197725
This also includes the rename from mylar to mylyn that zest when through
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath b/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath
index bc4a396..b199b8b 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath
@@ -1,6 +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.200707131144.jar"/>
+ <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.core_0.5.0.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.layouts_0.5.0.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4">
<accessrules>
<accessrule kind="nonaccessible" pattern="**/System/**"/>
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 6a34d71..cfbe315 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
@@ -7,13 +7,10 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.pde.ui,
- org.eclipse.ui.forms,
- org.eclipse.mylar.zest.core,
- org.eclipse.mylar.zest.layouts,
- org.eclipse.draw2d
+ org.eclipse.ui.forms
Eclipse-LazyStart: true
Bundle-ClassPath: .,
- org.eclipse.draw2d_3.2.2.200703221218.jar,
- org.eclipse.mylar.zest.core_0.4.0.jar,
- org.eclipse.mylar.zest.layouts_0.3.1.jar
+ org.eclipse.draw2d_3.2.100.200707131144.jar,
+ org.eclipse.mylyn.zest.core_0.5.0.0.jar,
+ org.eclipse.mylyn.zest.layouts_0.5.0.0.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 b28d10a..a65030d 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/build.properties
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/build.properties
@@ -1,9 +1,9 @@
bin.includes = META-INF/,\
plugin.xml,\
.,\
- org.eclipse.draw2d_3.2.2.200703221218.jar,\
- org.eclipse.mylar.zest.core_0.4.0.jar,\
- org.eclipse.mylar.zest.layouts_0.3.1.jar
+ org.eclipse.draw2d_3.2.100.200707131144.jar,\
+ org.eclipse.mylyn.zest.core_0.5.0.0.jar,\
+ org.eclipse.mylyn.zest.layouts_0.5.0.0.jar
src.includes = src/,\
plugin.xml,\
META-INF/
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.100.200707131144.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.100.200707131144.jar
new file mode 100644
index 0000000..e3d6f1c
--- /dev/null
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.100.200707131144.jar
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.2.200703221218.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.2.200703221218.jar
deleted file mode 100644
index fbc15ed..0000000
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.draw2d_3.2.2.200703221218.jar
+++ /dev/null
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylar.zest.core_0.4.0.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylar.zest.core_0.4.0.jar
deleted file mode 100644
index f61ed4e..0000000
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylar.zest.core_0.4.0.jar
+++ /dev/null
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylar.zest.layouts_0.3.1.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylar.zest.layouts_0.3.1.jar
deleted file mode 100644
index c9b6ef9..0000000
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylar.zest.layouts_0.3.1.jar
+++ /dev/null
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.0.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.0.jar
new file mode 100644
index 0000000..e86ae8e
--- /dev/null
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.0.jar
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.0.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.0.jar
new file mode 100644
index 0000000..3b04bfb
--- /dev/null
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.0.jar
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/AbstractVisualizationLabelProvider.java b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/AbstractVisualizationLabelProvider.java
index 1bc0933..bb2bd47 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/AbstractVisualizationLabelProvider.java
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/AbstractVisualizationLabelProvider.java
@@ -15,11 +15,11 @@
import org.eclipse.draw2d.IFigure;
import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.mylar.zest.core.widgets.ZestStyles;
-import org.eclipse.mylar.zest.core.viewers.EntityConnectionData;
-import org.eclipse.mylar.zest.core.viewers.GraphViewer;
-import org.eclipse.mylar.zest.core.viewers.IConnectionStyleProvider;
-import org.eclipse.mylar.zest.core.viewers.IEntityStyleProvider;
+import org.eclipse.mylyn.zest.core.viewers.EntityConnectionData;
+import org.eclipse.mylyn.zest.core.viewers.GraphViewer;
+import org.eclipse.mylyn.zest.core.viewers.IConnectionStyleProvider;
+import org.eclipse.mylyn.zest.core.viewers.IEntityStyleProvider;
+import org.eclipse.mylyn.zest.core.widgets.ZestStyles;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/GraphContentProvider.java b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/GraphContentProvider.java
index c8948cd..987c68b 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/GraphContentProvider.java
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/GraphContentProvider.java
@@ -11,7 +11,7 @@
package org.eclipse.pde.visualization.dependency.views;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.mylar.zest.core.viewers.IGraphEntityContentProvider;
+import org.eclipse.mylyn.zest.core.viewers.IGraphEntityContentProvider;
import org.eclipse.osgi.service.resolver.BundleDescription;
/**
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/HighlightDependencyLableProvider.java b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/HighlightDependencyLableProvider.java
index 0a4db52..874ad55 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/HighlightDependencyLableProvider.java
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/HighlightDependencyLableProvider.java
@@ -12,8 +12,8 @@
import java.util.HashSet;
-import org.eclipse.mylar.zest.core.viewers.EntityConnectionData;
-import org.eclipse.mylar.zest.core.viewers.GraphViewer;
+import org.eclipse.mylyn.zest.core.viewers.EntityConnectionData;
+import org.eclipse.mylyn.zest.core.viewers.GraphViewer;
import org.eclipse.osgi.service.resolver.BundleDescription;
/**
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/PathDependencyAnalysis.java b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/PathDependencyAnalysis.java
index e4468ac..4a766ff 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/PathDependencyAnalysis.java
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/PathDependencyAnalysis.java
@@ -13,8 +13,8 @@
import java.util.Arrays;
import java.util.HashSet;
-import org.eclipse.mylar.zest.core.viewers.EntityConnectionData;
-import org.eclipse.mylar.zest.core.viewers.GraphViewer;
+import org.eclipse.mylyn.zest.core.viewers.EntityConnectionData;
+import org.eclipse.mylyn.zest.core.viewers.GraphViewer;
import org.eclipse.osgi.service.resolver.BundleDescription;
/**
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 0a9a80d..06893a2 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
@@ -25,19 +25,19 @@
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.window.Window;
-import org.eclipse.mylar.zest.core.viewers.AbstractZoomableViewer;
-import org.eclipse.mylar.zest.core.viewers.GraphViewer;
-import org.eclipse.mylar.zest.core.viewers.IGraphEntityContentProvider;
-import org.eclipse.mylar.zest.core.viewers.IZoomableWorkbenchPart;
-import org.eclipse.mylar.zest.core.viewers.ZoomContributionViewItem;
-import org.eclipse.mylar.zest.core.widgets.Graph;
-import org.eclipse.mylar.zest.core.widgets.GraphNode;
-import org.eclipse.mylar.zest.core.widgets.ZestStyles;
-import org.eclipse.mylar.zest.layouts.LayoutAlgorithm;
-import org.eclipse.mylar.zest.layouts.LayoutStyles;
-import org.eclipse.mylar.zest.layouts.algorithms.CompositeLayoutAlgorithm;
-import org.eclipse.mylar.zest.layouts.algorithms.HorizontalShift;
-import org.eclipse.mylar.zest.layouts.algorithms.TreeLayoutAlgorithm;
+import org.eclipse.mylyn.zest.core.viewers.AbstractZoomableViewer;
+import org.eclipse.mylyn.zest.core.viewers.GraphViewer;
+import org.eclipse.mylyn.zest.core.viewers.IGraphEntityContentProvider;
+import org.eclipse.mylyn.zest.core.viewers.IZoomableWorkbenchPart;
+import org.eclipse.mylyn.zest.core.viewers.ZoomContributionViewItem;
+import org.eclipse.mylyn.zest.core.widgets.Graph;
+import org.eclipse.mylyn.zest.core.widgets.GraphNode;
+import org.eclipse.mylyn.zest.core.widgets.ZestStyles;
+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.HorizontalShift;
+import org.eclipse.mylyn.zest.layouts.algorithms.TreeLayoutAlgorithm;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
@@ -154,6 +154,9 @@
}
viewer.setLabelProvider(this.currentLabelProvider);
+ //viewer.refresh();
+ //viewer.setInput(this.currentBundle);
+
} else if (!dependencyPath && !(currentLabelProvider instanceof HighlightDependencyLableProvider)) {
this.currentLabelProvider = new HighlightDependencyLableProvider(this.viewer);
@@ -166,7 +169,7 @@
}
// Set the pinned node in case we have one from the previous content
- // provdier
+ // provider
this.currentLabelProvider.setPinnedNode((BundleDescription) pinnedNode);
if (viewer.getSelection() != null) {
viewer.setSelection(viewer.getSelection());
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/ShortestPathDependencyAnalysis.java b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/ShortestPathDependencyAnalysis.java
index 3dccaa5..e254127 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/ShortestPathDependencyAnalysis.java
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/ShortestPathDependencyAnalysis.java
@@ -13,8 +13,8 @@
import java.util.Arrays;
import java.util.HashSet;
-import org.eclipse.mylar.zest.core.viewers.EntityConnectionData;
-import org.eclipse.mylar.zest.core.viewers.GraphViewer;
+import org.eclipse.mylyn.zest.core.viewers.EntityConnectionData;
+import org.eclipse.mylyn.zest.core.viewers.GraphViewer;
import org.eclipse.osgi.service.resolver.BundleDescription;
/**
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/SmartPathDependencyAnalysis.java b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/SmartPathDependencyAnalysis.java
index eb9f18a..c01320f 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/SmartPathDependencyAnalysis.java
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/SmartPathDependencyAnalysis.java
@@ -13,8 +13,8 @@
import java.util.Arrays;
import java.util.HashSet;
-import org.eclipse.mylar.zest.core.viewers.EntityConnectionData;
-import org.eclipse.mylar.zest.core.viewers.GraphViewer;
+import org.eclipse.mylyn.zest.core.viewers.EntityConnectionData;
+import org.eclipse.mylyn.zest.core.viewers.GraphViewer;
import org.eclipse.osgi.service.resolver.BundleDescription;
/**
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/VisualizationForm.java b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/VisualizationForm.java
index 94c48bd..8608439 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/VisualizationForm.java
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/src/org/eclipse/pde/visualization/dependency/views/VisualizationForm.java
@@ -10,7 +10,7 @@
******************************************************************************/
package org.eclipse.pde.visualization.dependency.views;
-import org.eclipse.mylar.zest.core.viewers.GraphViewer;
+import org.eclipse.mylyn.zest.core.viewers.GraphViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.events.SelectionAdapter;