Refactoring and adapted CSS styling to HawkBit
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
This commit is contained in:
@@ -26,10 +26,6 @@ public class SuggestToken {
|
|||||||
* the character position of the start of the token
|
* the character position of the start of the token
|
||||||
* @param end
|
* @param end
|
||||||
* the character position of the end of the token
|
* the character position of the end of the token
|
||||||
* @param the
|
|
||||||
* token image name which is currently parsed, e.g. entered image
|
|
||||||
* name is {@code na} which the suggestion can be based on and
|
|
||||||
* e.g. filter the suggestions.
|
|
||||||
* @param tokenImageName
|
* @param tokenImageName
|
||||||
* the entered name of the token, e.g. could be the beginning of
|
* the entered name of the token, e.g. could be the beginning of
|
||||||
* the suggestion like 'na' or 'name'
|
* the suggestion like 'na' or 'name'
|
||||||
@@ -61,6 +57,7 @@ public class SuggestToken {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "SuggestToken [start=" + start + ", end=" + end + ", suggestion=" + suggestion + "]";
|
return "SuggestToken [start=" + start + ", end=" + end + ", suggestion=" + suggestion + ", tokenImageName="
|
||||||
|
+ tokenImageName + "]";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,8 @@ import cz.jirutka.rsql.parser.ParseException;
|
|||||||
* A {@link ParseException} wrapper which allows to access the parsing
|
* A {@link ParseException} wrapper which allows to access the parsing
|
||||||
* information from the exception using reflection due there is no other access
|
* information from the exception using reflection due there is no other access
|
||||||
* of this information. See issue for requesting feature
|
* of this information. See issue for requesting feature
|
||||||
* {@link https://github.com/jirutka/rsql-parser/issues/22}
|
* <a href="https://github.com/jirutka/rsql-parser/issues/22">https://github.com
|
||||||
|
* /jirutka/rsql-parser/issues/22</a>
|
||||||
*/
|
*/
|
||||||
public class ParseExceptionWrapper {
|
public class ParseExceptionWrapper {
|
||||||
|
|
||||||
|
|||||||
@@ -51,7 +51,9 @@ import cz.jirutka.rsql.parser.RSQLParserException;
|
|||||||
* {@link ParseException}.
|
* {@link ParseException}.
|
||||||
*
|
*
|
||||||
* There is a feature request on the GitHub project
|
* There is a feature request on the GitHub project
|
||||||
* {@link https://github.com/jirutka/rsql-parser/issues/22}.
|
* <a href="https://github.com/jirutka/rsql-parser/issues/22">https://github.com
|
||||||
|
* /jirutka/rsql-parser/issues/22</a>
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
public class RsqlParserValidationOracle implements RsqlValidationOracle {
|
public class RsqlParserValidationOracle implements RsqlValidationOracle {
|
||||||
|
|
||||||
|
|||||||
@@ -27,9 +27,9 @@ import org.eclipse.hawkbit.ui.filtermanagement.AutoCompleteTextFieldComponent.Fi
|
|||||||
import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
import org.eclipse.hawkbit.ui.filtermanagement.event.CustomFilterUIEvent;
|
||||||
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
import org.eclipse.hawkbit.ui.filtermanagement.state.FilterManagementUIState;
|
||||||
import org.eclipse.hawkbit.ui.utils.I18N;
|
import org.eclipse.hawkbit.ui.utils.I18N;
|
||||||
import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider;
|
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
|
||||||
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
|
||||||
|
import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider;
|
||||||
import org.eclipse.hawkbit.ui.utils.UINotification;
|
import org.eclipse.hawkbit.ui.utils.UINotification;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.vaadin.spring.events.EventBus;
|
import org.vaadin.spring.events.EventBus;
|
||||||
@@ -363,12 +363,6 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
|
|||||||
return saveButton;
|
return saveButton;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* (non-Javadoc)
|
|
||||||
*
|
|
||||||
* @see com.vaadin.ui.Button.ClickListener#buttonClick(com.vaadin.ui.Button.
|
|
||||||
* ClickEvent)
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public void buttonClick(final ClickEvent event) {
|
public void buttonClick(final ClickEvent event) {
|
||||||
if (UIComponentIdProvider.CUSTOM_FILTER_SAVE_ICON.equals(event.getComponent().getId())
|
if (UIComponentIdProvider.CUSTOM_FILTER_SAVE_ICON.equals(event.getComponent().getId())
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.gwt-MenuBar-autocomplete .gwt-MenuItem-selected {
|
.gwt-MenuBar-autocomplete .gwt-MenuItem-selected {
|
||||||
background-color: #197de1 !important;
|
background-color: $hawkbit-primary-color;
|
||||||
background-image: linear-gradient(to bottom, #1b87e3 2%, #166ed5 98%) !important;
|
background-image: linear-gradient(to bottom, #1b87e3 2%, #166ed5 98%) !important;
|
||||||
color: #ecf2f8 !important;
|
color: #ecf2f8 !important;
|
||||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.05) !important;
|
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.05) !important;
|
||||||
|
|||||||
Reference in New Issue
Block a user