add new constants, fix typo

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-09-05 19:12:06 +02:00
parent 2f415c4839
commit 9ee4a60a89
5 changed files with 40 additions and 20 deletions

View File

@@ -26,6 +26,7 @@ import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTypeEvent;
import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTypeEvent.DistributionSetTypeEnum; import org.eclipse.hawkbit.ui.distributions.event.DistributionSetTypeEvent.DistributionSetTypeEnum;
import org.eclipse.hawkbit.ui.layouts.CreateUpdateTypeLayout; import org.eclipse.hawkbit.ui.layouts.CreateUpdateTypeLayout;
import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil;
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -130,8 +131,8 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout<Distri
buildSelectedTable(); buildSelectedTable();
final VerticalLayout selectButtonLayout = new VerticalLayout(); final VerticalLayout selectButtonLayout = new VerticalLayout();
final Button selectButton = SPUIComponentProvider.getButton("select-dist-type", "", "", "arrow-button", true, final Button selectButton = SPUIComponentProvider.getButton(SPUIComponentIdProvider.SELECT_DIST_TYPE, "", "",
FontAwesome.FORWARD, SPUIButtonStyleSmallNoBorder.class); "arrow-button", true, FontAwesome.FORWARD, SPUIButtonStyleSmallNoBorder.class);
selectButton.addClickListener(event -> addSMType()); selectButton.addClickListener(event -> addSMType());
final Button unSelectButton = SPUIComponentProvider.getButton("unselect-dist-type", "", "", "arrow-button", final Button unSelectButton = SPUIComponentProvider.getButton("unselect-dist-type", "", "", "arrow-button",
true, FontAwesome.BACKWARD, SPUIButtonStyleSmallNoBorder.class); true, FontAwesome.BACKWARD, SPUIButtonStyleSmallNoBorder.class);

View File

@@ -94,7 +94,7 @@ public class TargetFilterTable extends Table {
populateTableData(); populateTableData();
setColumnCollapsingAllowed(true); setColumnCollapsingAllowed(true);
setColumnProperties(); setColumnProperties();
setId(SPUIComponentIdProvider.TAEGET_FILTER_TABLE_ID); setId(SPUIComponentIdProvider.TARGET_FILTER_TABLE_ID);
eventBus.subscribe(this); eventBus.subscribe(this);
} }

View File

@@ -113,7 +113,7 @@ public class ActionTypeOptionGroupLayout extends HorizontalLayout {
.getItemComponent(ActionTypeOption.AUTO_FORCED); .getItemComponent(ActionTypeOption.AUTO_FORCED);
autoForceItem.setStyleName(STYLE_DIST_WINDOW_ACTIONTYPE); autoForceItem.setStyleName(STYLE_DIST_WINDOW_ACTIONTYPE);
// setted Id for Time Forced radio button. // setted Id for Time Forced radio button.
autoForceItem.setId("save.action.radio.timeforced"); autoForceItem.setId(SPUIComponentIdProvider.ACTION_TYPE_OPTION_GROUP_SAVE_TIMEFORCED);
addComponent(autoForceItem); addComponent(autoForceItem);
final Label autoForceLabel = new Label(); final Label autoForceLabel = new Label();
autoForceLabel.setStyleName("statusIconPending"); autoForceLabel.setStyleName("statusIconPending");

View File

@@ -17,6 +17,7 @@ import org.eclipse.hawkbit.ui.tenantconfiguration.authentication.CertificateAuth
import org.eclipse.hawkbit.ui.tenantconfiguration.authentication.GatewaySecurityTokenAuthenticationConfigurationItem; import org.eclipse.hawkbit.ui.tenantconfiguration.authentication.GatewaySecurityTokenAuthenticationConfigurationItem;
import org.eclipse.hawkbit.ui.tenantconfiguration.authentication.TargetSecurityTokenAuthenticationConfigurationItem; import org.eclipse.hawkbit.ui.tenantconfiguration.authentication.TargetSecurityTokenAuthenticationConfigurationItem;
import org.eclipse.hawkbit.ui.utils.I18N; import org.eclipse.hawkbit.ui.utils.I18N;
import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeEvent;
@@ -112,7 +113,7 @@ public class AuthenticationConfigurationView extends BaseConfigurationView
gridLayout.addComponent(gatewaySecurityTokenAuthenticationConfigurationItem, 1, 2); gridLayout.addComponent(gatewaySecurityTokenAuthenticationConfigurationItem, 1, 2);
downloadAnonymousCheckBox = SPUIComponentProvider.getCheckBox("", DIST_CHECKBOX_STYLE, null, false, ""); downloadAnonymousCheckBox = SPUIComponentProvider.getCheckBox("", DIST_CHECKBOX_STYLE, null, false, "");
downloadAnonymousCheckBox.setId("downloadanonymouscheckbox"); downloadAnonymousCheckBox.setId(SPUIComponentIdProvider.DOWNLOAD_ANONYMOUS_CHECKBOX);
downloadAnonymousCheckBox.setValue(anonymousDownloadAuthenticationConfigurationItem.isConfigEnabled()); downloadAnonymousCheckBox.setValue(anonymousDownloadAuthenticationConfigurationItem.isConfigEnabled());
downloadAnonymousCheckBox.addValueChangeListener(this); downloadAnonymousCheckBox.addValueChangeListener(this);
anonymousDownloadAuthenticationConfigurationItem.addChangeListener(this); anonymousDownloadAuthenticationConfigurationItem.addChangeListener(this);

View File

@@ -313,6 +313,11 @@ public final class SPUIComponentIdProvider {
*/ */
public static final String ACTION_HISTORY_TABLE_FORCE_QUIT_ID = "action.history.table.action.force.quit"; public static final String ACTION_HISTORY_TABLE_FORCE_QUIT_ID = "action.history.table.action.force.quit";
/**
* ID for option group save timeforced
*/
public static final String ACTION_TYPE_OPTION_GROUP_SAVE_TIMEFORCED = "save.action.radio.timeforced";
/** /**
* Target filter wrapper id. * Target filter wrapper id.
*/ */
@@ -734,10 +739,20 @@ public final class SPUIComponentIdProvider {
*/ */
public static final String CUSTOM_TARGET_TAG_TABLE_ID = "custom.target.tag.tableId"; public static final String CUSTOM_TARGET_TAG_TABLE_ID = "custom.target.tag.tableId";
/**
* ID for closing custom filter
*/
public static final String CUSTOM_FILTER_CLOSE = "create.custom.filter.close.Id";
/**
* ID for custom filter query text
*/
public static final String CUSTOM_FILTER_QUERY = "custom.query.text.Id";
/** /**
* Target filter table id. * Target filter table id.
*/ */
public static final String TAEGET_FILTER_TABLE_ID = "target.query.filter.table.Id"; public static final String TARGET_FILTER_TABLE_ID = "target.query.filter.table.Id";
/** /**
* create or update target filter query - name label id. * create or update target filter query - name label id.
@@ -962,17 +977,16 @@ public final class SPUIComponentIdProvider {
*/ */
public static final String UPLOAD_STATUS_POPUP_ID = "artifact.upload.status.popup.id"; public static final String UPLOAD_STATUS_POPUP_ID = "artifact.upload.status.popup.id";
/** /**
* Software module table - Manage metadata id. * Software module table - Manage metadata id.
*/ */
public static final String SW_TABLE_MANAGE_METADATA_ID = "swtable.manage.metadata.id"; public static final String SW_TABLE_MANAGE_METADATA_ID = "swtable.manage.metadata.id";
/** /**
* Metadata key id. * Metadata key id.
*/ */
public static final String METADATA_KEY_FIELD_ID = "metadata.key.id"; public static final String METADATA_KEY_FIELD_ID = "metadata.key.id";
/** /**
* Metadata value id. * Metadata value id.
*/ */
@@ -981,12 +995,12 @@ public final class SPUIComponentIdProvider {
* Metadata save id. * Metadata save id.
*/ */
public static final String METADTA_SAVE_ICON_ID = "metadata.save.icon.id"; public static final String METADTA_SAVE_ICON_ID = "metadata.save.icon.id";
/** /**
* Metadata discard id. * Metadata discard id.
*/ */
public static final String METADTA_DISCARD_ICON_ID = "metadata.discard.icon.id"; public static final String METADTA_DISCARD_ICON_ID = "metadata.discard.icon.id";
/** /**
* Metadata add icon id. * Metadata add icon id.
*/ */
@@ -995,41 +1009,45 @@ public final class SPUIComponentIdProvider {
* Metadata table id. * Metadata table id.
*/ */
public static final String METDATA_TABLE_ID = "metadata.table.id"; public static final String METDATA_TABLE_ID = "metadata.table.id";
/** /**
* Distribution set table - Manage metadata id. * Distribution set table - Manage metadata id.
*/ */
public static final String DS_TABLE_MANAGE_METADATA_ID = "dstable.manage.metadata.id"; public static final String DS_TABLE_MANAGE_METADATA_ID = "dstable.manage.metadata.id";
/** /**
* DistributionSet - Metadata button id. * DistributionSet - Metadata button id.
*/ */
public static final String DS_METADATA_DETAIL_LINK = "distributionset.metadata.detail.link"; public static final String DS_METADATA_DETAIL_LINK = "distributionset.metadata.detail.link";
/** /**
* Metadata popup id. * Metadata popup id.
*/ */
public static final String METADATA_POPUP_ID = "metadata.popup.id"; public static final String METADATA_POPUP_ID = "metadata.popup.id";
/** /**
* DistributionSet table details tab id in Distributions . * DistributionSet table details tab id in Distributions .
*/ */
public static final String DISTRIBUTIONSET_DETAILS_TABSHEET_ID = "distributionset.details.tabsheet"; public static final String DISTRIBUTIONSET_DETAILS_TABSHEET_ID = "distributionset.details.tabsheet";
/** /**
* Software module table details tab id in Distributions . * Software module table details tab id in Distributions .
*/ */
public static final String DIST_SW_MODULE_DETAILS_TABSHEET_ID = "dist.sw.module.details.tabsheet"; public static final String DIST_SW_MODULE_DETAILS_TABSHEET_ID = "dist.sw.module.details.tabsheet";
/** /**
* Software Module - Metadata button id. * Software Module - Metadata button id.
*/ */
public static final String SW_METADATA_DETAIL_LINK = "softwaremodule.metadata.detail.link"; public static final String SW_METADATA_DETAIL_LINK = "softwaremodule.metadata.detail.link";
/** /**
* Table multiselect for selecting DistType * Table multiselect for selecting DistType
*/ */
public static final String SELECT_DIST_TYPE = "select-dist-type"; public static final String SELECT_DIST_TYPE = "select-dist-type";
/**
* ID for download anonymous checkbox
*/
public static final String DOWNLOAD_ANONYMOUS_CHECKBOX = "downloadanonymouscheckbox";
/** /**
* /* Private Constructor. * /* Private Constructor.