lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

More refactoring (added early returns)

Browse Source 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
This commit is contained in:
Jonathan Philip Knoblauch
2016-10-04 10:16:08 +02:00
parent fa3cee62bf
commit 8c7af7d28d
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java
View File

@@ -92,9 +92,12 @@ public class RsqlParserValidationOracle implements RsqlValidationOracle {
} }
private static Collection<? extends SuggestToken> getLogicalOperatorSuggestion(final String rsqlQuery) { private static Collection<? extends SuggestToken> getLogicalOperatorSuggestion(final String rsqlQuery) {
if (!rsqlQuery.endsWith(" ")) {
return Collections.emptyList();
}
if (rsqlQuery.endsWith(" ")) {
final int currentQueryLength = rsqlQuery.length(); final int currentQueryLength = rsqlQuery.length();
// only return and/or suggestion when there is a space at the end // only return and/or suggestion when there is a space at the end
if (rsqlQuery.endsWith(" ")) {
final Collection<String> tokenImages = TokenDescription.getTokenImage(TokenDescription.LOGICAL_OP); final Collection<String> tokenImages = TokenDescription.getTokenImage(TokenDescription.LOGICAL_OP);
final List<SuggestToken> logicalOps = new ArrayList<>(tokenImages.size()); final List<SuggestToken> logicalOps = new ArrayList<>(tokenImages.size());
for (final String tokenImage : tokenImages) { for (final String tokenImage : tokenImages) {

8
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
View File

@@ -379,10 +379,14 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
} }
private void onSearchIconClick() { private void onSearchIconClick() {
if (!queryTextField.isValidationError()) {
if (queryTextField.isValidationError()) {
return;
}
queryTextField.showValidationInProgress(); queryTextField.showValidationInProgress();
queryTextField.getExecutor().execute(queryTextField.new StatusCircledAsync(UI.getCurrent())); queryTextField.getExecutor().execute(queryTextField.new StatusCircledAsync(UI.getCurrent()));
}
} }
@Override @Override

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/AutoCompleteTextFieldConnector.java
View File

@@ -54,7 +54,10 @@ public class AutoCompleteTextFieldConnector extends AbstractExtensionConnector {
@Override @Override
public void showSuggestions(final SuggestionContextDto suggestContext) { public void showSuggestions(final SuggestionContextDto suggestContext) {
select.clearItems(); select.clearItems();
if (suggestContext != null) { if (suggestContext == null) {
panel.hide();
return;
}
final List<SuggestTokenDto> suggestions = suggestContext.getSuggestions(); final List<SuggestTokenDto> suggestions = suggestContext.getSuggestions();
if (suggestions != null && !suggestions.isEmpty()) { if (suggestions != null && !suggestions.isEmpty()) {
select.addItems(suggestions, textFieldWidget, panel, rpc); select.addItems(suggestions, textFieldWidget, panel, rpc);
@@ -62,7 +65,6 @@ public class AutoCompleteTextFieldConnector extends AbstractExtensionConnector {
select.moveSelectionDown(); select.moveSelectionDown();
return; return;
} }
}
panel.hide(); panel.hide();
} }
}); });