瀏覽代碼

Create DescriptionGenerator in package com.vaadin.ui (#10346)

Deprecate com.vaadin.ui.components.grid.DescriptionGenerator
and subclass it from the new DescriptionGenerator.
tags/8.3.0.alpha1
Aleksi Hietanen 6 年之前
父節點
當前提交
de5c9a394a

+ 0
- 1
server/src/main/java/com/vaadin/ui/CheckBoxGroup.java 查看文件

@@ -35,7 +35,6 @@ import com.vaadin.server.SerializablePredicate;
import com.vaadin.shared.Registration;
import com.vaadin.shared.ui.ListingJsonConstants;
import com.vaadin.shared.ui.optiongroup.CheckBoxGroupState;
import com.vaadin.ui.components.grid.DescriptionGenerator;
import com.vaadin.ui.declarative.DesignContext;
import com.vaadin.ui.declarative.DesignFormatter;


+ 32
- 0
server/src/main/java/com/vaadin/ui/DescriptionGenerator.java 查看文件

@@ -0,0 +1,32 @@
/*
* Copyright 2000-2016 Vaadin Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.vaadin.ui;

import com.vaadin.server.SerializableFunction;

/**
* A callback interface for generating description texts for an item.
*
* @author Vaadin Ltd
* @since 8.2
*
* @param <T>
* the item type
*/
@FunctionalInterface
public interface DescriptionGenerator<T>
extends SerializableFunction<T, String> {
}

+ 0
- 1
server/src/main/java/com/vaadin/ui/Grid.java 查看文件

@@ -97,7 +97,6 @@ import com.vaadin.shared.ui.grid.SectionState;
import com.vaadin.ui.components.grid.ColumnReorderListener;
import com.vaadin.ui.components.grid.ColumnResizeListener;
import com.vaadin.ui.components.grid.ColumnVisibilityChangeListener;
import com.vaadin.ui.components.grid.DescriptionGenerator;
import com.vaadin.ui.components.grid.DetailsGenerator;
import com.vaadin.ui.components.grid.Editor;
import com.vaadin.ui.components.grid.EditorImpl;

+ 0
- 1
server/src/main/java/com/vaadin/ui/RadioButtonGroup.java 查看文件

@@ -38,7 +38,6 @@ import com.vaadin.server.SerializablePredicate;
import com.vaadin.shared.Registration;
import com.vaadin.shared.ui.ListingJsonConstants;
import com.vaadin.shared.ui.optiongroup.RadioButtonGroupState;
import com.vaadin.ui.components.grid.DescriptionGenerator;
import com.vaadin.ui.declarative.DesignContext;
import com.vaadin.ui.declarative.DesignFormatter;


+ 0
- 1
server/src/main/java/com/vaadin/ui/Tree.java 查看文件

@@ -59,7 +59,6 @@ import com.vaadin.shared.ui.grid.ScrollDestination;
import com.vaadin.shared.ui.tree.TreeMultiSelectionModelState;
import com.vaadin.shared.ui.tree.TreeRendererState;
import com.vaadin.ui.Grid.SelectionMode;
import com.vaadin.ui.components.grid.DescriptionGenerator;
import com.vaadin.ui.components.grid.MultiSelectionModelImpl;
import com.vaadin.ui.components.grid.NoSelectionModel;
import com.vaadin.ui.components.grid.SingleSelectionModelImpl;

+ 4
- 3
server/src/main/java/com/vaadin/ui/components/grid/DescriptionGenerator.java 查看文件

@@ -15,8 +15,6 @@
*/
package com.vaadin.ui.components.grid;

import com.vaadin.server.SerializableFunction;

/**
* A callback interface for generating description texts for an item.
*
@@ -25,8 +23,11 @@ import com.vaadin.server.SerializableFunction;
*
* @param <T>
* the grid bean type
* @deprecated as of 8.2, use the DescriptionGenerator found in package
* com.vaadin.ui instead.
*/
@FunctionalInterface
@Deprecated
public interface DescriptionGenerator<T>
extends SerializableFunction<T, String> {
extends com.vaadin.ui.DescriptionGenerator<T> {
}

+ 1
- 1
uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxGroupTestUI.java 查看文件

@@ -20,8 +20,8 @@ import java.util.LinkedHashMap;
import com.vaadin.icons.VaadinIcons;
import com.vaadin.tests.components.abstractlisting.AbstractMultiSelectTestUI;
import com.vaadin.ui.CheckBoxGroup;
import com.vaadin.ui.DescriptionGenerator;
import com.vaadin.ui.IconGenerator;
import com.vaadin.ui.components.grid.DescriptionGenerator;

/**
* Test UI for CheckBoxGroup component

+ 1
- 1
uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java 查看文件

@@ -29,6 +29,7 @@ import com.vaadin.shared.ui.grid.HeightMode;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
import com.vaadin.ui.DescriptionGenerator;
import com.vaadin.ui.Grid;
import com.vaadin.ui.Grid.Column;
import com.vaadin.ui.Grid.SelectionMode;
@@ -43,7 +44,6 @@ import com.vaadin.ui.SingleSelect;
import com.vaadin.ui.StyleGenerator;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.components.grid.DescriptionGenerator;
import com.vaadin.ui.components.grid.DetailsGenerator;
import com.vaadin.ui.components.grid.FooterCell;
import com.vaadin.ui.components.grid.FooterRow;

+ 1
- 1
uitest/src/main/java/com/vaadin/tests/components/radiobutton/RadioButtonGroupTestUI.java 查看文件

@@ -20,9 +20,9 @@ import java.util.stream.IntStream;

import com.vaadin.icons.VaadinIcons;
import com.vaadin.tests.components.abstractlisting.AbstractListingTestUI;
import com.vaadin.ui.DescriptionGenerator;
import com.vaadin.ui.ItemCaptionGenerator;
import com.vaadin.ui.RadioButtonGroup;
import com.vaadin.ui.components.grid.DescriptionGenerator;

/**
* Test UI for RadioButtonGroup component

Loading…
取消
儲存