NEW - bug 168729: [pde viz] Add EE Filter to view
https://bugs.eclipse.org/bugs/show_bug.cgi?id=168729
Removed EE filters since it doesn't really make sense at this time.
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..9aa392e 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
@@ -9,7 +9,8 @@
org.eclipse.pde.ui,
org.eclipse.ui.forms,
org.eclipse.equinox.launcher,
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ org.eclipse.jdt.launching
Eclipse-LazyStart: true
Bundle-ClassPath: .,
org.eclipse.draw2d_3.2.100.200708201246.jar,
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..a12a255 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
@@ -181,6 +181,14 @@
return;
}
Object selectedElement = selection.getFirstElement();
+ if ( selectedElement instanceof BundleDescription ) {
+ String[] executionEnvironments = ((BundleDescription)selectedElement).getExecutionEnvironments();
+ for (int i = 0; i < executionEnvironments.length; i++) {
+ System.out.println(executionEnvironments[i]);
+ }
+ System.out.println();
+ System.out.println();
+ }
if (selectedElement instanceof BundleDescription || selectedElement instanceof BundleSpecification) {
focusOn(selectedElement, true, null);
// When a new plug-in is selected, disable the forward action.
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 110904e..0181675 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
@@ -46,7 +46,6 @@
import org.eclipse.ui.forms.ManagedForm;
import org.eclipse.ui.forms.events.HyperlinkAdapter;
import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.Form;
import org.eclipse.ui.forms.widgets.FormText;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -71,15 +70,7 @@
private static String Plugin_Dependency_Analysis = "Plug-in Dependency Analysis";
private static String Controls = "Controls";
private static String Show_Dependency_Path = "Show Dependency Path";
- private static String Exeuction_Environment = "Execution Environment";
private static String Version_Number = "Show Bundle Version Numbers";
- private static String Execution_Environment_Instructions = "Show bunldes with execution environment:";
- private static String Java6 = "Java 6.0 and above";
- private static String Java5 = "Java 5.0 and above";
- private static String Java4 = "Java 4.0 and above";
- private static String Java3 = "Java 3.0 and above";
- private static String Java2 = "Java 2.0 and above";
- private static String Java1 = "Java 1.0 and above";
/*
* These are strings and used to determine which radio button is selected
@@ -224,13 +215,12 @@
shell.setLocation(hl);
shell.pack();
shell.open();
- }
- else if ( href instanceof IMessage[] ){
- IMessage oneMessage = ((IMessage[])href)[0];
+ } else if (href instanceof IMessage[]) {
+ IMessage oneMessage = ((IMessage[]) href)[0];
ErrorReporting error = (ErrorReporting) oneMessage.getData();
if (error != null) {
error.handleError();
- }
+ }
}
}
});
@@ -241,7 +231,7 @@
public void linkActivated(HyperlinkEvent e) {
String is = (String) e.getHref();
try {
- ((FormText)e.widget).getShell().dispose();
+ ((FormText) e.widget).getShell().dispose();
int index = Integer.parseInt(is);
IMessage[] messages = form.getChildrenMessages();
IMessage message = messages[index];
@@ -429,36 +419,9 @@
setDependencyPath(false);
dependencyOptions.setClient(dependencyOptionsComposite);
- createEEAnalysisSection(controlComposite);
controls.setClient(controlComposite);
}
- /**
- * Creates the section holding the Execution Environment Controls
- *
- * @param parent
- */
- private void createEEAnalysisSection(Composite parent) {
- ExpandableComposite eeAnalysis = this.toolkit.createExpandableComposite(parent, Section.TITLE_BAR | Section.TWISTIE);
- eeAnalysis.setText(Exeuction_Environment);
- eeAnalysis.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- Composite eeAnalysisControls = this.toolkit.createComposite(eeAnalysis);
- eeAnalysisControls.setLayout(new TableWrapLayout());
- this.toolkit.createLabel(eeAnalysisControls, Execution_Environment_Instructions, SWT.WRAP);
- Button ee6 = this.toolkit.createButton(eeAnalysisControls, Java6, SWT.RADIO);
- ee6.setLayoutData(new TableWrapData(TableWrapData.FILL));
- Button ee5 = this.toolkit.createButton(eeAnalysisControls, Java5, SWT.RADIO);
- ee5.setLayoutData(new TableWrapData(TableWrapData.FILL));
- Button ee4 = this.toolkit.createButton(eeAnalysisControls, Java4, SWT.RADIO);
- ee4.setLayoutData(new TableWrapData(TableWrapData.FILL));
- Button ee3 = this.toolkit.createButton(eeAnalysisControls, Java3, SWT.RADIO);
- ee3.setLayoutData(new TableWrapData(TableWrapData.FILL));
- Button ee2 = this.toolkit.createButton(eeAnalysisControls, Java2, SWT.RADIO);
- ee2.setLayoutData(new TableWrapData(TableWrapData.FILL));
- Button ee1 = this.toolkit.createButton(eeAnalysisControls, Java1, SWT.RADIO);
- ee1.setLayoutData(new TableWrapData(TableWrapData.FILL));
- eeAnalysis.setClient(eeAnalysisControls);
- }
/**
* Gets the currentGraphViewern