RESOLVED - bug 199506: Clean up the zest style bits
https://bugs.eclipse.org/bugs/show_bug.cgi?id=199506
RESOLVED - bug 201770: Fisheye applied to all nodes in JFace viewer, even when style not set
https://bugs.eclipse.org/bugs/show_bug.cgi?id=201770
RESOLVED - bug 197963: Use ZestRootLayer for container children
https://bugs.eclipse.org/bugs/show_bug.cgi?id=197963
RESOLVED - bug 202217: Figure (or label font) resizes on hover or selection
https://bugs.eclipse.org/bugs/show_bug.cgi?id=202217
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath b/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath
index 4bf768c..b98c813 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/.classpath
@@ -2,8 +2,8 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="org.eclipse.draw2d_3.2.100.200708201246.jar"/>
- <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.core_0.5.0.200708201246.jar"/>
- <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar"/>
+ <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.core_0.6.0.200709101339.jar"/>
+ <classpathentry exported="true" kind="lib" path="org.eclipse.mylyn.zest.layouts_0.6.0.200709101339.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 9cfda07..732b036 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
@@ -13,6 +13,6 @@
Eclipse-LazyStart: true
Bundle-ClassPath: .,
org.eclipse.draw2d_3.2.100.200708201246.jar,
- org.eclipse.mylyn.zest.core_0.5.0.200708201246.jar,
- org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar
+ org.eclipse.mylyn.zest.core_0.6.0.200709101339.jar,
+ org.eclipse.mylyn.zest.layouts_0.6.0.200709101339.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 a9d2d3c..44017f6 100644
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/build.properties
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/build.properties
@@ -3,8 +3,8 @@
icons/,\
.,\
org.eclipse.draw2d_3.2.100.200708201246.jar,\
- org.eclipse.mylyn.zest.core_0.5.0.200708201246.jar,\
- org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar
+ org.eclipse.mylyn.zest.core_0.6.0.200709101339.jar,\
+ org.eclipse.mylyn.zest.layouts_0.6.0.200709101339.jar
src.includes = src/,\
plugin.xml,\
META-INF/,\
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.200708201246.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.200708201246.jar
deleted file mode 100644
index b4d61b0..0000000
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.5.0.200708201246.jar
+++ /dev/null
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.6.0.200709101339.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.6.0.200709101339.jar
new file mode 100644
index 0000000..e5637e5
--- /dev/null
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.core_0.6.0.200709101339.jar
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar
deleted file mode 100644
index d3a8e59..0000000
--- a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.5.0.200708170620.jar
+++ /dev/null
Binary files differ
diff --git a/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.6.0.200709101339.jar b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.6.0.200709101339.jar
new file mode 100644
index 0000000..e5cd52d
--- /dev/null
+++ b/visualization/plugins/org.eclipse.pde.visualization.dependency/org.eclipse.mylyn.zest.layouts_0.6.0.200709101339.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 d07e5a7..5e72777 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
@@ -250,6 +250,14 @@
return selected;
}
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.mylyn.zest.core.viewers.IEntityStyleProvider#fisheyeNode(java.lang.Object)
+ */
+ public boolean fisheyeNode(Object entity) {
+ return true;
+ }
+
/**
* Sets the current selection
*
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 0e06901..0dfe7e8 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
@@ -128,19 +128,7 @@
*/
public void createPartControl(Composite parent) {
- toolKit = new FormToolkit(parent.getDisplay()) {
- /*
- public ScrolledForm createScrolledForm(Composite parent) {
- ScrolledForm form = new ScrolledForm(parent, SWT.NONE);
- form.setExpandHorizontal(true);
- form.setExpandVertical(true);
- form.setBackground(getColors().getBackground());
- form.setForeground(getColors().getColor(IFormColors.TITLE));
- form.setFont(JFaceResources.getHeaderFont());
- return form;
- }
- */
- };
+ toolKit = new FormToolkit(parent.getDisplay());
visualizationForm = new VisualizationForm(parent, toolKit, this);
viewer = visualizationForm.getGraphViewer();
form = visualizationForm.getForm();
@@ -393,30 +381,6 @@
// Don't report errors while error reporting
ErrorReporting.createErrorReports(elements, this, managedForm.getMessageManager());
}
-
- /*
- boolean loopsFound = false;
- int counter = 0;
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] instanceof BundleDescription) {
- BundleDescription bundleDescription = (BundleDescription) elements[i];
- IPluginModelBase model = PluginRegistry.findModel(bundleDescription);
- DependencyLoop[] loops = DependencyLoopFinder.findLoops(((IPluginModel) model).getPlugin());
- if (loops.length > 0) {
- counter += loops.length;
- loopsFound = true;
- }
- } else {
- // We don't need to worry about looking for cycles in BundleSpecifications (they are not resolved)
- continue;
- }
- }
- managedForm.getMessageManager().removeAllMessages();
- if (loopsFound) {
- managedForm.getMessageManager().addMessage("first error", "first error", new UnresolvedError(this, null), IMessage.ERROR);
- managedForm.getMessageManager().addMessage("second error", "second error", new UnresolvedError(this, null), IMessage.ERROR);
- }
- */
}
public void handleUnresolvedDependencyError(UnresolvedError unresolvedError) {
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 0181675..7005263 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
@@ -65,7 +65,7 @@
/*
* These are all the strings used in the form. These can probably be
- * abstracted for internationalization
+ * abstracted for internationalisation
*/
private static String Plugin_Dependency_Analysis = "Plug-in Dependency Analysis";
private static String Controls = "Controls";
@@ -144,11 +144,12 @@
headClient.setBackgroundMode(SWT.INHERIT_DEFAULT);
searchLabel = new Label(headClient, SWT.NONE);
searchLabel.setText("Search:");
- searchBox = new Text(headClient, toolkit.getBorderStyle() | SWT.SEARCH | SWT.CANCEL);
+ searchBox = toolkit.createText(headClient, "");
GridData data = new GridData();
data.widthHint = 300;
searchBox.setLayoutData(data);
- ToolBar cancelBar = new ToolBar(headClient, SWT.NONE);
+ ToolBar cancelBar = new ToolBar(headClient, toolkit.getBorderStyle() | SWT.FLAT );
+
cancelIcon = new ToolItem(cancelBar, SWT.NONE);
cancelIcon.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
@@ -287,7 +288,6 @@
*/
private void createSash(Composite parent) {
sash = new SashForm(parent, SWT.NONE);
- //sash.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);
this.toolkit.paintBordersFor(parent);
createGraphSection(sash);
@@ -313,12 +313,7 @@
* @param parent
*/
private void createGraphSection(Composite parent) {
-
Section section = this.toolkit.createSection(parent, Section.TITLE_BAR);
- //section.setLayout(new FillLayout());
- //Composite composOIte = this.toolkit.createComposite(section, SWT.NONE);
- //composite.setLayout(new FillLayout());
- //viewer = new GraphViewer(composite, SWT.BORDER);
viewer = new MyGraphViewer(section, SWT.NONE);
section.setClient(viewer.getControl());
}