test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refs #1713 [Desktop] Don't create unnecessary lookup button

Browse Source
This commit is contained in:
Yuriy Artamonov 2012-12-03 15:06:04 +00:00
parent a566fe66be
commit a35d360110
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/desktop/src/com/haulmont/cuba/desktop/gui/components/AbstractFieldFactory.java
View File

@ -13,7 +13,8 @@ import com.haulmont.chile.core.datatypes.impl.*;
import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.chile.core.model.MetaProperty;
import com.haulmont.chile.core.model.MetaPropertyPath;
import com.haulmont.cuba.core.global.MessageProvider;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.gui.AppConfig;
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.DateField;
@ -28,9 +29,8 @@ import java.util.Map;
import java.util.TreeMap;
/**
* <p>$Id$</p>
*
* @author krivopustov
* @version $Id$
*/
public abstract class AbstractFieldFactory {
@ -122,7 +122,7 @@ public abstract class AbstractFieldFactory {
String dateFormat = xmlDescriptor == null ? null : xmlDescriptor.attributeValue("dateFormat");
if (!StringUtils.isEmpty(dateFormat)) {
if (dateFormat.startsWith("msg://")) {
dateFormat = MessageProvider.getMessage(
dateFormat = AppBeans.get(Messages.class).getMessage(
AppConfig.getMessagesPack(), dateFormat.substring(6, dateFormat.length()));
}
dateField.setDateFormat(dateFormat);
@ -142,6 +142,8 @@ public abstract class AbstractFieldFactory {
CollectionDatasource optionsDatasource = getOptionsDatasource(datasource, property);
if (optionsDatasource == null) {
pickerField = new DesktopPickerField();
pickerField.addLookupAction();
pickerField.addClearAction();
} else {
pickerField = new DesktopLookupPickerField();
((DesktopLookupPickerField) pickerField).setOptionsDatasource(optionsDatasource);
@ -149,16 +151,14 @@ public abstract class AbstractFieldFactory {
pickerField.removeAction(pickerField.getAction(PickerField.LookupAction.NAME));
}
pickerField.setDatasource(datasource, property);
pickerField.addLookupAction();
pickerField.addClearAction();
return pickerField;
}
private Component createEnumField(Datasource datasource, String property, MetaProperty metaProperty) {
Map<String, Object> options = new TreeMap<String, Object>();
Map<String, Object> options = new TreeMap<>();
Enumeration<Enum> enumeration = metaProperty.getRange().asEnumeration();
for (Enum value : enumeration.getValues()) {
String caption = MessageProvider.getMessage(value);
String caption = AppBeans.get(Messages.class).getMessage(value);
options.put(caption, value);
}