From f20140fbd53c3b9216f61001c8f6bac7f68c3be3 Mon Sep 17 00:00:00 2001 From: AMU7KOR Date: Mon, 27 Jun 2016 11:27:01 +0530 Subject: [PATCH] Fixed compilation issue Signed-off-by: AMU7KOR --- .../smtable/SoftwareModuleTable.java | 28 +++++++++++- .../dstable/DistributionSetDetails.java | 5 --- .../dstable/DistributionSetTable.java | 44 ------------------- 3 files changed, 26 insertions(+), 51 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java index a27ab6682..0416243f7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java @@ -8,14 +8,12 @@ */ package org.eclipse.hawkbit.ui.artifacts.smtable; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.eclipse.hawkbit.repository.SoftwareManagement; import org.eclipse.hawkbit.repository.model.SoftwareModule; -import org.eclipse.hawkbit.repository.model.SoftwareModuleMetadata; import org.eclipse.hawkbit.ui.artifacts.event.SMFilterEvent; import org.eclipse.hawkbit.ui.artifacts.event.SoftwareModuleEvent; import org.eclipse.hawkbit.ui.artifacts.event.UploadArtifactUIEvent; @@ -23,10 +21,14 @@ import org.eclipse.hawkbit.ui.artifacts.event.UploadViewAcceptCriteria; import org.eclipse.hawkbit.ui.artifacts.state.ArtifactUploadState; import org.eclipse.hawkbit.ui.common.table.AbstractNamedVersionTable; import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType; +import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; +import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder; +import org.eclipse.hawkbit.ui.distributions.smtable.SwMetadataPopupLayout; 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.SPUILabelDefinitions; +import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions; import org.eclipse.hawkbit.ui.utils.TableColumn; import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory; @@ -40,8 +42,11 @@ import com.vaadin.data.Item; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; +import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.ui.Button; +import com.vaadin.ui.Table; import com.vaadin.ui.UI; /** @@ -62,6 +67,9 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable showMetadataDetails((Long) itemId, nameVersionStr)); + return manageMetaDataBtn; + } + }); + } + @Override protected List getTableVisibleColumns() { final List columnList = super.getTableVisibleColumns(); if (!isMaximized()) { + columnList.add(new TableColumn(SPUILabelDefinitions.METADATA_ICON, "", 0.1F)); return columnList; } columnList.add(new TableColumn(SPUILabelDefinitions.VAR_VENDOR, i18n.get("header.vendor"), 0.1F)); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java index 368932d6c..6b1cb4689 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java @@ -405,11 +405,6 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet return true; } - @Override - protected Boolean isMetadataIconToBeDisplayed() { - return true; - } - @Override protected String getShowMetadataButtonId() { DistributionSetIdName lastselectedDistDS = manageDistUIState.getLastSelectedDistribution().isPresent() ? manageDistUIState diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java index 66ce57197..58b64d1b0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java @@ -496,51 +496,7 @@ public class DistributionSetTable extends AbstractNamedVersionTable getTableVisibleColumns() { - final List columnList = super.getTableVisibleColumns(); - if (!isMaximized()) { - columnList.add(new TableColumn(SPUILabelDefinitions.METADATA_ICON, "", 0.1F)); - } - return columnList; - } - private Button createManageMetadataButton(String nameVersionStr) { - final Button manageMetadataBtn = SPUIComponentProvider.getButton( - SPUIComponentIdProvider.DS_TABLE_MANAGE_METADATA_ID + "." + nameVersionStr, "", "", null, false, - FontAwesome.LIST_ALT, SPUIButtonStyleSmallNoBorder.class); - manageMetadataBtn.addStyleName(SPUIStyleDefinitions.ARTIFACT_DTLS_ICON); - manageMetadataBtn.setDescription(i18n.get("tooltip.metadata.icon")); - return manageMetadataBtn; - } - - private void showMetadataDetails(Long itemId) { - DistributionSet ds = distributionSetManagement.findDistributionSetByIdWithDetails(itemId); - UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(ds,null)); - } - - private String getNameAndVerion(final Object itemId) { - final Item item = getItem(itemId); - final String name = (String) item.getItemProperty(SPUILabelDefinitions.VAR_NAME).getValue(); - final String version = (String) item.getItemProperty(SPUILabelDefinitions.VAR_VERSION).getValue(); - return name + "." + version; - } - - @Override - protected void addCustomGeneratedColumns() { - addGeneratedColumn(SPUILabelDefinitions.METADATA_ICON, new ColumnGenerator() { - private static final long serialVersionUID = 117186282275065399L; - - @Override - public Object generateCell(final Table source, final Object itemId, final Object columnId) { - final String nameVersionStr = getNameAndVerion(itemId); - final Button manageMetaDataBtn = createManageMetadataButton(nameVersionStr); - manageMetaDataBtn.addClickListener(event -> showMetadataDetails(((DistributionSetIdName) itemId).getId())); - return manageMetaDataBtn; - } - }); - } - @Override protected List getTableVisibleColumns() { final List columnList = super.getTableVisibleColumns();