Refactoring Filter from call Hierarchy #1730

jannisCode · 2024-10-22T09:58:16Z

What it does

This PR is a refactoring of the code for the filters in the Call Hierarchy.
It makes the code more modifiable and versatile

Author checklist

I have thoroughly tested my changes
The change is following the coding conventions
I have signed the Eclipse Contributor Agreement (ECA)

eclipse-jdt#1730

Now it works with an enum rather than an array which is much nicer

eclipse-jdt#1730

Now it works with an enum rather than an array which is much nicer

jannisCode · 2024-10-25T12:22:28Z

I used your feedback and used Enums istead of arrays in the latest commit! Everything else is still the same!

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

fedejeanne

Check the formatting, check for unnecessary changes, check the naming of the parameters (use camelCase) and there is also unnecessary if-else blocks (you can inline the content of the if)

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

gzsombor · 2024-10-29T18:16:14Z

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java

@@ -43,6 +44,7 @@ class FiltersDialog extends StatusDialog {
    private Button fShowAll;
    private Button fHideTest;
    private Button fShowTest;
+    private Button[] buttons = {fShowAll, fHideTest, fShowTest}; //important what comes when


This doesn't make too much sense, here the buttons is initialized with 3 nulls, in a complicated way.

You can remove the fShowAll,fHideTest,fShowTest

gzsombor · 2024-10-29T18:19:27Z

...core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallHierarchyFilterOptions.java

+public enum CallHierarchyFilterOptions {
+	SHOW_ALL_CODE("PREF_SHOW_ALL_CODE",  "Show All Code"), //$NON-NLS-1$ //$NON-NLS-2$
+	HIDE_TEST_CODE("PREF_HIDE_TEST_CODE", "Hide Test Code"), //$NON-NLS-1$ //$NON-NLS-2$
+	SHOW_TEST_CODE_ONLY("PREF_SHOW_TEST_CODE_ONLY", "Test Code only"); //$NON-NLS-1$ //$NON-NLS-2$


You should use the proper CallHierarchyMessages.FiltersDialog_ShowAllCode variables to return the labels.

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

eclipse-jdt-bot · 2024-11-25T08:43:04Z

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

org.eclipse.jdt.core.manipulation/META-INF/MANIFEST.MF
org.eclipse.jdt.ui/META-INF/MANIFEST.MF
org.eclipse.jdt.ui/pom.xml

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch

From 869fc92358bb89b2bdb05604a43adc93e9dcf2bb Mon Sep 17 00:00:00 2001
From: Eclipse JDT Bot <[email protected]>
Date: Mon, 25 Nov 2024 08:42:39 +0000
Subject: [PATCH] Version bump(s) for 4.35 stream


diff --git a/org.eclipse.jdt.core.manipulation/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.manipulation/META-INF/MANIFEST.MF
index cce3d0f53d..fc6299b123 100644
--- a/org.eclipse.jdt.core.manipulation/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.manipulation/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.core.manipulation
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.core.manipulation; singleton:=true
-Bundle-Version: 1.21.300.qualifier
+Bundle-Version: 1.21.400.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.jdt.internal.core.manipulation.JavaManipulationPlugin
 Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.ui/META-INF/MANIFEST.MF
index 0a5b80724a..d1e2321293 100644
--- a/org.eclipse.jdt.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.ui
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.ui; singleton:=true
-Bundle-Version: 3.33.200.qualifier
+Bundle-Version: 3.33.300.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.ui.JavaPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.ui/pom.xml b/org.eclipse.jdt.ui/pom.xml
index fffaedcc7e..3818bc298e 100644
--- a/org.eclipse.jdt.ui/pom.xml
+++ b/org.eclipse.jdt.ui/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.ui</artifactId>
-  <version>3.33.200-SNAPSHOT</version>
+  <version>3.33.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 	<build>
-- 
2.47.0

Further information are available in Common Build Issues - Missing version increments.

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

fedejeanne · 2024-12-02T15:07:14Z

...lipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallHierarchy.java

+			if(Boolean.parseBoolean(JavaManipulation.getPreference(option.getId(), null))) {
+				return option;
+			}
+		} return null;


Suggested change

} return null;

}

return null;

fedejeanne · 2024-12-02T15:09:06Z

...lipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallHierarchy.java

-        IPreferenceStore settings = JavaPlugin.getDefault().getPreferenceStore();
-        settings.setValue(PREF_HIDE_TEST_CODE, value);
+    	for(CallHierarchyFilterOptions option : CallHierarchyFilterOptions.values()) {
+    		settings.setValue(option.getId(), option == filter ? true : false);


Suggested change

settings.setValue(option.getId(), option == filter ? true : false);

settings.setValue(option.getId(), option == filter);

fedejeanne · 2024-12-02T15:09:36Z

...lipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallHierarchy.java

-    }
-
+	public CallHierarchyFilterOptions getActiveFilter() {
+		for (CallHierarchyFilterOptions option: CallHierarchyFilterOptions.values()) { //must be one of the threee


Suggested change

for (CallHierarchyFilterOptions option: CallHierarchyFilterOptions.values()) { //must be one of the threee

for (CallHierarchyFilterOptions option: CallHierarchyFilterOptions.values()) {

fedejeanne · 2024-12-02T15:11:54Z

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java

 		updateEnabledState();
 	}

+	private CallHierarchyFilterOptions getFilterOptions(Button B) {


Suggested change

private CallHierarchyFilterOptions getFilterOptions(Button B) {

private CallHierarchyFilterOptions getFilterOptions(Button b) {

fedejeanne · 2024-12-02T15:23:09Z

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java

-    private Button fShowAll;
-    private Button fHideTest;
-    private Button fShowTest;
+    private Button[] buttons = new Button[CallHierarchyFilterOptions.values().length]; //important what comes when


Suggested change

private Button[] buttons = new Button[CallHierarchyFilterOptions.values().length]; //important what comes when

private List<Button> buttons = new ArrayList<>(CallHierarchyFilterOptions.values().length); //important what comes when

fedejeanne · 2024-12-02T15:27:12Z

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java

+		for (int i = 0; i < buttons.length; i++) {
+			buttons[i] = new Button(radioGroup, SWT.RADIO);
+			buttons[i].setText(getFilterOptions(buttons[i]).getText());
+		}


It is odd that you end up calling getFilterOptions to know what should go into the text. Also, if you add a new value to CallHierarchyFilterOptions then you need to adapt the method getFilterOptions. How about you:
a) Get the text by querying the current CallHierarchyFilterOptions and
b) Put the corresponding option into the data of the button so you can query it later in the getFilterOptions

Suggested change

for (int i = 0; i < buttons.length; i++) {

buttons[i] = new Button(radioGroup, SWT.RADIO);

buttons[i].setText(getFilterOptions(buttons[i]).getText());

}

for (CallHierarchyFilterOptions op : CallHierarchyFilterOptions.values()) {

Button b = new Button(radioGroup, SWT.RADIO);

b.setText(op.getText());

b.setData(KEY_CALL_HIERARCHY_FILTER_OPTION, op);

buttons.add(b);

}

?

thanks for the help! I implemented it the way you suggestend!

fedejeanne · 2024-12-02T15:28:48Z

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java

+		if(B == buttons[0]) {
+				return CallHierarchyFilterOptions.SHOW_ALL_CODE;
+			} else if (B == buttons[1]) {
+				return CallHierarchyFilterOptions.HIDE_TEST_CODE;
+			} else {
+				return CallHierarchyFilterOptions.SHOW_TEST_CODE_ONLY;
+			}


If you have the corresponding option in the data then you can simply query it.

Suggested change

if(B == buttons[0]) {

return CallHierarchyFilterOptions.SHOW_ALL_CODE;

} else if (B == buttons[1]) {

return CallHierarchyFilterOptions.HIDE_TEST_CODE;

} else {

return CallHierarchyFilterOptions.SHOW_TEST_CODE_ONLY;

}

return (CallHierarchyFilterOptions) b.getData(KEY_CALL_HIERARCHY_FILTER_OPTION);

fedejeanne · 2024-12-02T15:30:36Z

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java

@@ -40,9 +41,7 @@ class FiltersDialog extends StatusDialog {
    private Button fFilterOnNames;


You need this one if you follow my advice below:

Suggested change

private Button fFilterOnNames;

private static final String KEY_CALL_HIERARCHY_FILTER_OPTION= "callHierarchyFilterOption"; //$NON-NLS-1$

private Button fFilterOnNames;

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

fedejeanne · 2024-12-03T09:38:44Z

...lipse.jdt.ui/core extension/org/eclipse/jdt/internal/corext/callhierarchy/CallHierarchy.java

-        IPreferenceStore settings = JavaPlugin.getDefault().getPreferenceStore();
-        settings.setValue(PREF_HIDE_TEST_CODE, value);
+    	for(CallHierarchyFilterOptions option : CallHierarchyFilterOptions.values()) {
+    		settings.setValue(option.getId(), option == filter);    	}


Suggested change

settings.setValue(option.getId(), option == filter); }

settings.setValue(option.getId(), option == filter);

}

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

fedejeanne · 2024-12-09T14:58:22Z

@gzsombor is this PR good to go?

Maybe some committer would like to (review and) merge?

gzsombor · 2024-12-10T17:52:08Z

org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/callhierarchy/FiltersDialog.java

+
+		for (Button button : buttons) {
+			button.setLayoutData(gridData);
+		}
 	}


I would rewrite this function to this:

Suggested change

}

private void createTestCodeArea(Composite parent) {

Composite radioGroup= new Composite(parent, SWT.NONE);

radioGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

GridLayout layout= new GridLayout();

layout.numColumns= 1;

radioGroup.setLayout(layout);

GridData gridData= new GridData(GridData.FILL_HORIZONTAL);

gridData.horizontalIndent= 0;

for (CallHierarchyFilterOptions op : CallHierarchyFilterOptions.values()) {

Button b= new Button(radioGroup, SWT.RADIO);

b.setText(op.getText());

b.setData(KEY_CALL_HIERARCHY_FILTER_OPTION, op);

b.setLayoutData(gridData);

buttons.add(b);

}

setSelection();

}

That would fix the trimming of the labels too.

This is not a refactoring, it adds/changes the following lines:

radioGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

GridData gridData= new GridData(GridData.FILL_HORIZONTAL);

b.setLayoutData(gridData);

This should be done in another PR.

jannisCode force-pushed the Refactoring_CallHierarchy branch from 6f320a6 to b598a1b Compare October 22, 2024 10:43

jannisCode mentioned this pull request Oct 22, 2024

Filter top menu #1731

Draft

3 tasks

jannisCode force-pushed the Refactoring_CallHierarchy branch from b598a1b to 138e939 Compare October 22, 2024 14:02

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 23, 2024

Refactoring Filter from call Hierarchy eclipse-jdt#1730

12a4eb0

eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 138e939 to 12a4eb0 Compare October 23, 2024 09:41

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 25, 2024

Refactoring Filter from call Hierarchy eclipse-jdt#1730

1d16fb4

eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 12a4eb0 to 1d16fb4 Compare October 25, 2024 07:54

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 25, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

05762ad

Now it works with an enum rather than an array which is much nicer

jannisCode force-pushed the Refactoring_CallHierarchy branch from 1d16fb4 to 05762ad Compare October 25, 2024 11:18

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 25, 2024

Refactoring Filter from call Hierarchy eclipse-jdt#1730

9ef9fec

eclipse-jdt#1730

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 25, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

de3e1dc

Now it works with an enum rather than an array which is much nicer

jannisCode force-pushed the Refactoring_CallHierarchy branch from 05762ad to de3e1dc Compare October 25, 2024 12:21

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 25, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

381b6cd

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from de3e1dc to 381b6cd Compare October 25, 2024 12:23

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 25, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

405eaa4

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 381b6cd to 405eaa4 Compare October 25, 2024 12:26

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 25, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

cc0b1e8

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 405eaa4 to cc0b1e8 Compare October 25, 2024 12:27

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 25, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

b89f05b

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from cc0b1e8 to b89f05b Compare October 25, 2024 12:28

fedejeanne suggested changes Oct 29, 2024

View reviewed changes

jannisCode force-pushed the Refactoring_CallHierarchy branch from b89f05b to cc0b1e8 Compare October 29, 2024 13:43

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 29, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

e002f0d

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from cc0b1e8 to e002f0d Compare October 29, 2024 13:48

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 29, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

ac35cdf

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from e002f0d to ac35cdf Compare October 29, 2024 13:50

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 29, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

fcdbf21

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from ac35cdf to fcdbf21 Compare October 29, 2024 13:53

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Oct 29, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

95c0110

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 60d5494 to 8f206b7 Compare October 29, 2024 14:08

gzsombor reviewed Oct 29, 2024

View reviewed changes

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Nov 4, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

323ece0

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 8f206b7 to 323ece0 Compare November 4, 2024 08:43

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Nov 4, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

1814d0a

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 323ece0 to 1814d0a Compare November 4, 2024 09:51

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Nov 13, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

5952983

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 1814d0a to 5952983 Compare November 13, 2024 07:01

jannisCode marked this pull request as ready for review November 19, 2024 14:32

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Nov 25, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

4be571a

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 5952983 to 4be571a Compare November 25, 2024 08:39

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Dec 2, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

d0d0eda

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 962d7f2 to d0d0eda Compare December 2, 2024 09:00

fedejeanne suggested changes Dec 2, 2024

View reviewed changes

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Dec 3, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

5737c4c

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from d0d0eda to 5737c4c Compare December 3, 2024 08:31

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Dec 3, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

4664372

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 5737c4c to 4664372 Compare December 3, 2024 08:48

fedejeanne reviewed Dec 3, 2024

View reviewed changes

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Dec 3, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

cf7200f

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from 4664372 to cf7200f Compare December 3, 2024 09:49

jannisCode added a commit to jannisCode/eclipse.jdt.ui that referenced this pull request Dec 6, 2024

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

e66345f

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from cf7200f to e66345f Compare December 6, 2024 08:20

fedejeanne approved these changes Dec 6, 2024

View reviewed changes

Refactoring Filter from Call Hierarchy eclipse-jdt#1730

b48d2c4

Now it works with an enum rather than an array which is much nicer eclipse-jdt#1730

jannisCode force-pushed the Refactoring_CallHierarchy branch from e66345f to b48d2c4 Compare December 9, 2024 09:55

gzsombor reviewed Dec 10, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactoring Filter from call Hierarchy #1730

Refactoring Filter from call Hierarchy #1730

jannisCode commented Oct 22, 2024

jannisCode commented Oct 25, 2024

fedejeanne left a comment

gzsombor Oct 29, 2024

jannisCode Nov 4, 2024

gzsombor Oct 29, 2024

jannisCode Nov 4, 2024

eclipse-jdt-bot commented Nov 25, 2024

fedejeanne Dec 2, 2024

jannisCode Dec 3, 2024

fedejeanne Dec 2, 2024

jannisCode Dec 3, 2024

fedejeanne Dec 2, 2024

jannisCode Dec 3, 2024

fedejeanne Dec 2, 2024

jannisCode Dec 3, 2024

fedejeanne Dec 2, 2024

jannisCode Dec 3, 2024

fedejeanne Dec 2, 2024

jannisCode Dec 3, 2024

fedejeanne Dec 2, 2024

jannisCode Dec 3, 2024

fedejeanne Dec 2, 2024

jannisCode Dec 3, 2024

fedejeanne Dec 3, 2024

jannisCode Dec 3, 2024

fedejeanne commented Dec 9, 2024

gzsombor Dec 10, 2024

fedejeanne Dec 11, 2024

	settings.setValue(option.getId(), option == filter ? true : false);
	settings.setValue(option.getId(), option == filter);

	for (CallHierarchyFilterOptions option: CallHierarchyFilterOptions.values()) { //must be one of the threee
	for (CallHierarchyFilterOptions option: CallHierarchyFilterOptions.values()) {

	private CallHierarchyFilterOptions getFilterOptions(Button B) {
	private CallHierarchyFilterOptions getFilterOptions(Button b) {

	private Button[] buttons = new Button[CallHierarchyFilterOptions.values().length]; //important what comes when
	private List<Button> buttons = new ArrayList<>(CallHierarchyFilterOptions.values().length); //important what comes when

-		for (int i = 0; i < buttons.length; i++) {
-			buttons[i] = new Button(radioGroup, SWT.RADIO);
-			buttons[i].setText(getFilterOptions(buttons[i]).getText());
-		}
+		for (CallHierarchyFilterOptions op : CallHierarchyFilterOptions.values()) {
+			Button b = new Button(radioGroup, SWT.RADIO);
+			b.setText(op.getText());
+			b.setData(KEY_CALL_HIERARCHY_FILTER_OPTION, op);
+			buttons.add(b);
+		}

		@@ -40,9 +41,7 @@ class FiltersDialog extends StatusDialog {
		private Button fFilterOnNames;

	private Button fFilterOnNames;
	private static final String KEY_CALL_HIERARCHY_FILTER_OPTION= "callHierarchyFilterOption"; //$NON-NLS-1$
	private Button fFilterOnNames;

-	}
+    private void createTestCodeArea(Composite parent) {
+		Composite radioGroup= new Composite(parent, SWT.NONE);
+		radioGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		GridLayout layout= new GridLayout();
+		layout.numColumns= 1;
+		radioGroup.setLayout(layout);
+		GridData gridData= new GridData(GridData.FILL_HORIZONTAL);
+		gridData.horizontalIndent= 0;
+		for (CallHierarchyFilterOptions op : CallHierarchyFilterOptions.values()) {
+			Button b= new Button(radioGroup, SWT.RADIO);
+			b.setText(op.getText());
+			b.setData(KEY_CALL_HIERARCHY_FILTER_OPTION, op);
+			b.setLayoutData(gridData);
+			buttons.add(b);
+		}
+		setSelection();
+	}

Refactoring Filter from call Hierarchy #1730

Are you sure you want to change the base?

Refactoring Filter from call Hierarchy #1730

Conversation

jannisCode commented Oct 22, 2024

What it does

Author checklist

jannisCode commented Oct 25, 2024

fedejeanne left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eclipse-jdt-bot commented Nov 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fedejeanne commented Dec 9, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment