Implements a StyleProcessor class to allow access to a list of set styles for a widget in String format. #2392
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| package org.eclipse.swt.widgets; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| import org.eclipse.swt.*; | ||
|
|
||
| public class StyleProcessor { | ||
|
There was a problem hiding this comment. Will this really become public API or can it just be package protected? There was a problem hiding this comment. Hello @merks, You're absolutely right, we actually intended for StyleProcessor to be package private, so that it can only be accessed within the widgets package. My teammate and I forgot that part, thank you for clarifying. Thank you so much! |
||
|
|
||
|
|
||
| private static class Rule { | ||
| ArrayList<String> ifOneOf; | ||
| ArrayList<String> thenOneOf; | ||
| ArrayList<String> thenSomeOf; | ||
|
|
||
| Rule(ArrayList<String> ifOneOf) { | ||
| this.ifOneOf = ifOneOf; | ||
| this.thenOneOf = new ArrayList<>(); | ||
| this.thenSomeOf = new ArrayList<>(); | ||
| } | ||
| } | ||
|
|
||
| private ArrayList<Rule> rules = new ArrayList<>(); | ||
| private ArrayList<ArrayList<String>> oneOfArr = new ArrayList<>(); | ||
| private ArrayList<String> someOfArr = new ArrayList<>(); | ||
| private Rule currentRule = null; | ||
|
|
||
| public StyleProcessor oneOf(String styles) { | ||
| String[] tempHolder = styles.split(", "); | ||
|
|
||
| oneOfArr.add(new ArrayList<>(Arrays.asList(tempHolder))); | ||
|
|
||
| return this; | ||
| } | ||
|
|
||
| public StyleProcessor someOf(String styles) { | ||
| String[] tempHolder = styles.split(", "); | ||
|
|
||
| someOfArr.addAll(Arrays.asList(tempHolder)); | ||
|
|
||
| return this; | ||
| } | ||
|
|
||
| public StyleProcessor ifOneOf(String styles) { | ||
| String[] tempHolder = styles.split(", "); | ||
| ArrayList<String> tempList = new ArrayList<>(Arrays.asList(tempHolder)); | ||
| currentRule = new Rule(tempList); | ||
| rules.add(currentRule); | ||
| return this; | ||
| } | ||
|
|
||
|
|
||
| public StyleProcessor thenOneOf(String styles) { | ||
| if (currentRule == null) { | ||
| throw new IllegalStateException("No 'ifOneOf' defined before 'thenOneOf'"); | ||
| } | ||
| currentRule.thenOneOf.addAll(Arrays.asList(styles.split(", "))); | ||
| return this; | ||
| } | ||
|
|
||
|
|
||
| public StyleProcessor thenSomeOf(String styles) { | ||
| if (currentRule == null) { | ||
| throw new IllegalStateException("No 'ifOneOf' defined before 'thenSomeOf'"); | ||
| } | ||
| currentRule.thenSomeOf.addAll(Arrays.asList(styles.split(", "))); | ||
| return this; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| public ArrayList<String> process(int style) { | ||
| ArrayList<String> finalList = new ArrayList<>(); | ||
| for (ArrayList<String> a: oneOfArr) { | ||
| for (String s: a) { | ||
| try { | ||
| if ((style & SWT.class.getField(s).getInt(null)) != 0) { | ||
| finalList.add(s); | ||
| break; | ||
| } | ||
| } catch (NoSuchFieldException | IllegalAccessException e) { | ||
| System.out.println("Invalid Style: " + s); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| for (String s : someOfArr) { | ||
| try { | ||
| if ((style & SWT.class.getField(s).getInt(null)) != 0) { | ||
| finalList.add(s); | ||
| } | ||
| } catch (NoSuchFieldException | IllegalAccessException e) { | ||
| System.out.println("Invalid Style: " + s); | ||
| } | ||
| } | ||
|
|
||
| for (Rule rule : rules) { | ||
| boolean matched = false; | ||
|
|
||
| for (String condition : rule.ifOneOf) { | ||
| try { | ||
| int flag = SWT.class.getField(condition).getInt(null); | ||
| if ((style & flag) != 0) { | ||
| matched = true; | ||
| break; | ||
| } | ||
| } catch (NoSuchFieldException | IllegalAccessException e) { | ||
| System.out.println("Invalid condition: " + condition); | ||
| } | ||
| } | ||
|
|
||
| if (matched) { | ||
| for (String s : rule.thenOneOf) { | ||
| try { | ||
| int flag = SWT.class.getField(s).getInt(null); | ||
| if ((style & flag) != 0) { | ||
| finalList.add(s); | ||
| break; | ||
| } | ||
| } catch (NoSuchFieldException | IllegalAccessException e) { | ||
| System.out.println("Invalid thenOneOf: " + s); | ||
| } | ||
| } | ||
|
|
||
| for (String s : rule.thenSomeOf) { | ||
| try { | ||
| int flag = SWT.class.getField(s).getInt(null); | ||
| if ((style & flag) != 0) { | ||
| finalList.add(s); | ||
| } | ||
| } catch (NoSuchFieldException | IllegalAccessException e) { | ||
| System.out.println("Invalid thenSomeOf: " + s);; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return finalList; | ||
| } | ||
|
|
||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One would never want to surface the List implementation class in any API; elsewhere too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello @merks,
Answering to your question...
We initially explored other approaches such as implementing it in a utility class or using annotations, however based on the comments and guidance that we got Issue #611. We were advised to directly change the SWT repository, specifically the widget classes instead. That being said, we are flexible and happy to revise the implementation.
You are right with what you've said. My teammate and I are planning to change this ArrayList to List instead and avoiding making the method public. We've only did it this way for testing purposes to see if it works and get feedback.
Thank you so much!
Teammate - @WillPeltz