test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-02 19:27:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-9735 Cleanup unused @Inject fields

Browse Source
This commit is contained in:
Yuriy Artamonov 2017-09-20 20:11:00 +04:00
parent 08a651eb6a
commit 5c238f033d
32 changed files with 15 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/client/src/com/haulmont/cuba/client/sys/cache/DynamicAttributesCacheStrategy.java vendored
View File

@ -20,10 +20,8 @@ package com.haulmont.cuba.client.sys.cache;
import com.haulmont.cuba.core.app.dynamicattributes.DynamicAttributesCache;
import com.haulmont.cuba.core.app.dynamicattributes.DynamicAttributesCacheService;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.Configuration;
import com.haulmont.cuba.core.sys.AppContext;
import com.haulmont.cuba.core.sys.SecurityContext;
import com.haulmont.cuba.security.app.LoginService;
import com.haulmont.cuba.security.global.NoUserSessionException;
import com.haulmont.cuba.security.global.UserSession;
import org.slf4j.Logger;
@ -49,10 +47,6 @@ public class DynamicAttributesCacheStrategy implements CachingStrategy {
@Inject
protected ClientCacheManager clientCacheManager;
@Inject
protected LoginService loginService;
@Inject
protected Configuration configuration;
@Inject
protected CacheUserSessionProvider cacheUserSessionProvider;
protected ReadWriteLock readWriteLock = new ReentrantReadWriteLock();

4
modules/gui/src/com/haulmont/cuba/gui/app/core/bulk/BulkEditorWindow.java
View File

@ -51,7 +51,6 @@ import java.util.stream.Collectors;
import static com.haulmont.bali.util.Preconditions.checkNotNullArgument;
public class BulkEditorWindow extends AbstractWindow {
@Inject
protected ViewRepository viewRepository;
@ -70,9 +69,6 @@ public class BulkEditorWindow extends AbstractWindow {
@Inject
protected ComponentsFactory componentsFactory;
@Inject
protected Configuration configuration;
@Inject
protected Security security;

4
modules/gui/src/com/haulmont/cuba/gui/app/core/categories/AttributeEditor.java
View File

@ -45,7 +45,6 @@ import com.haulmont.cuba.gui.components.filter.FakeFilterSupport;
import com.haulmont.cuba.gui.components.filter.FilterParser;
import com.haulmont.cuba.gui.components.filter.Param;
import com.haulmont.cuba.gui.components.filter.edit.FilterEditor;
import com.haulmont.cuba.gui.config.WindowConfig;
import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.data.impl.AbstractDatasource;
@ -119,9 +118,6 @@ public class AttributeEditor extends AbstractEditor<CategoryAttribute> {
@Inject
protected ComponentsFactory factory;
@Inject
protected WindowConfig windowConfig;
@Inject
protected Metadata metadata;

4
modules/gui/src/com/haulmont/cuba/gui/app/core/entityinspector/EntityInspectorBrowse.java
View File

@ -37,7 +37,6 @@ import com.haulmont.cuba.gui.components.Formatter;
import com.haulmont.cuba.gui.components.actions.*;
import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.DsBuilder;
import com.haulmont.cuba.gui.data.DsContext;
import com.haulmont.cuba.gui.data.impl.DsContextImplementation;
import com.haulmont.cuba.gui.export.ByteArrayDataProvider;
import com.haulmont.cuba.gui.export.ExportDisplay;
@ -92,9 +91,6 @@ public class EntityInspectorBrowse extends AbstractLookup {
@Inject
protected ComponentsFactory componentsFactory;
@Inject
protected DsContext dsContext;
@Inject
protected Configuration configuration;

4
modules/gui/src/com/haulmont/cuba/gui/app/core/showinfo/SystemInfoWindow.java
View File

@ -25,7 +25,6 @@ import com.haulmont.cuba.core.global.Metadata;
import com.haulmont.cuba.core.global.View;
import com.haulmont.cuba.gui.WindowParam;
import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.security.entity.Role;
@ -44,9 +43,6 @@ public class SystemInfoWindow extends AbstractWindow {
@Inject
protected Table infoTable;
@Inject
protected ThemeConstants themeConstants;
@Inject
protected TextArea scriptArea;

11
modules/gui/src/com/haulmont/cuba/gui/app/security/group/browse/GroupBrowser.java
View File

@ -29,13 +29,15 @@ import com.haulmont.cuba.core.entity.Entity;
import com.haulmont.cuba.core.global.*;
import com.haulmont.cuba.gui.WindowManager.OpenType;
import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.components.actions.*;
import com.haulmont.cuba.gui.components.actions.CreateAction;
import com.haulmont.cuba.gui.components.actions.EditAction;
import com.haulmont.cuba.gui.components.actions.ItemTrackingAction;
import com.haulmont.cuba.gui.components.actions.RemoveAction;
import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.HierarchicalDatasource;
import com.haulmont.cuba.gui.export.ByteArrayDataProvider;
import com.haulmont.cuba.gui.export.ExportDisplay;
import com.haulmont.cuba.gui.export.ExportFormat;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import com.haulmont.cuba.gui.upload.FileUploadingAPI;
import com.haulmont.cuba.gui.xml.layout.ComponentsFactory;
import com.haulmont.cuba.security.app.UserManagementService;
@ -56,7 +58,7 @@ import java.util.*;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import static com.haulmont.cuba.gui.components.DialogAction.*;
import static com.haulmont.cuba.gui.components.DialogAction.Type;
public class GroupBrowser extends AbstractWindow {
@ -95,9 +97,6 @@ public class GroupBrowser extends AbstractWindow {
@Inject
protected ComponentsFactory componentsFactory;
@Inject
protected ThemeConstants themeConstants;
@Inject
protected FileUploadField importUpload;

5
modules/gui/src/com/haulmont/cuba/gui/app/security/role/edit/RoleEditor.java
View File

@ -24,16 +24,11 @@ import com.haulmont.cuba.gui.components.TextField;
import com.haulmont.cuba.security.entity.Role;
import javax.inject.Inject;
import javax.inject.Named;
public class RoleEditor extends AbstractEditor<Role> {
@Inject
protected ScreenPermissionsFrame screensTabFrame;
@Named("name")
protected TextField nameField;
@Inject
protected TextField locName;

4
modules/gui/src/com/haulmont/cuba/gui/app/security/role/edit/tabs/SpecificPermissionsFrame.java
View File

@ -31,7 +31,6 @@ import com.haulmont.cuba.security.entity.EntityOp;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.security.entity.PermissionType;
import com.haulmont.cuba.security.entity.Role;
import com.haulmont.cuba.security.global.UserSession;
import org.apache.commons.lang.ObjectUtils;
import javax.inject.Inject;
@ -58,9 +57,6 @@ public class SpecificPermissionsFrame extends AbstractFrame {
@Inject
protected SpecificPermissionTreeDatasource specificPermissionsTreeDs;
@Inject
protected UserSession userSession;
@Inject
protected Metadata metadata;

4
modules/gui/src/com/haulmont/cuba/gui/app/security/role/edit/tabs/UiPermissionsFrame.java
View File

@ -35,7 +35,6 @@ import com.haulmont.cuba.security.entity.EntityOp;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.security.entity.PermissionType;
import com.haulmont.cuba.security.entity.Role;
import com.haulmont.cuba.security.global.UserSession;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
@ -63,9 +62,6 @@ public class UiPermissionsFrame extends AbstractFrame {
@Inject
protected UiPermissionsDatasource uiPermissionTargetsDs;
@Inject
protected UserSession userSession;
@Inject
protected Security security;

7
modules/gui/src/com/haulmont/cuba/gui/app/security/user/browse/UserBrowser.java
View File

@ -34,7 +34,6 @@ import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.xml.layout.ComponentsFactory;
import com.haulmont.cuba.security.app.UserManagementService;
import com.haulmont.cuba.security.entity.*;
import com.haulmont.cuba.security.global.UserSession;
import org.apache.commons.lang.BooleanUtils;
import javax.inject.Inject;
@ -49,9 +48,6 @@ public class UserBrowser extends AbstractLookup {
@Inject
protected CollectionDatasource<User, UUID> usersDs;
@Named("usersTable.remove")
protected RemoveAction removeAction;
@Named("usersTable.copySettings")
protected Action copySettingsAction;
@ -70,9 +66,6 @@ public class UserBrowser extends AbstractLookup {
@Inject
protected PopupButton additionalActionsBtn;
@Inject
protected UserSession userSession;
@Inject
protected Security security;

8
modules/gui/src/com/haulmont/cuba/gui/app/security/user/browse/UserLookup.java
View File

@ -22,18 +22,14 @@ import com.haulmont.cuba.gui.components.AbstractLookup;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.components.actions.RemoveAction;
import com.haulmont.cuba.security.app.UserManagementService;
import com.haulmont.cuba.security.entity.User;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.Map;
public class UserLookup extends AbstractLookup {
@Inject
protected Table usersTable;
@Named("usersTable.remove")
protected RemoveAction removeAction;
protected Table<User> usersTable;
@Inject
protected UserManagementService userManagementService;

4
modules/gui/src/com/haulmont/cuba/gui/app/security/user/copysettings/CopySettings.java
View File

@ -17,7 +17,6 @@
package com.haulmont.cuba.gui.app.security.user.copysettings;
import com.haulmont.cuba.client.ClientConfig;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.gui.WindowParam;
import com.haulmont.cuba.gui.components.*;
@ -44,9 +43,6 @@ public class CopySettings extends AbstractWindow {
@WindowParam(required = true)
protected Set<User> users;
@Inject
protected ClientConfig clientConfig;
@Override
public void init(Map<String, Object> params) {
super.init(params);

4
modules/gui/src/com/haulmont/cuba/gui/backgroundwork/BackgroundWorkProgressWindow.java
View File

@ -22,7 +22,6 @@ import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.executors.BackgroundTask;
import com.haulmont.cuba.gui.executors.BackgroundTaskHandler;
import com.haulmont.cuba.gui.executors.BackgroundWorker;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import org.apache.commons.lang.BooleanUtils;
import javax.annotation.Nullable;
@ -61,9 +60,6 @@ public class BackgroundWorkProgressWindow<T extends Number, V> extends AbstractW
@Inject
protected ProgressBar taskProgressBar;
@Inject
protected ThemeConstants themeConstants;
protected BackgroundTaskHandler<V> taskHandler;
protected boolean cancelAllowed = false;

4
modules/gui/src/com/haulmont/cuba/gui/backgroundwork/BackgroundWorkWindow.java
View File

@ -25,7 +25,6 @@ import com.haulmont.cuba.gui.components.Window;
import com.haulmont.cuba.gui.executors.BackgroundTask;
import com.haulmont.cuba.gui.executors.BackgroundTaskHandler;
import com.haulmont.cuba.gui.executors.BackgroundWorker;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import org.apache.commons.lang.BooleanUtils;
import javax.annotation.Nullable;
@ -58,9 +57,6 @@ public class BackgroundWorkWindow<T, V> extends AbstractWindow {
@Inject
protected BackgroundWorker backgroundWorker;
@Inject
protected ThemeConstants themeConstants;
protected BackgroundTaskHandler<V> taskHandler;
protected boolean cancelAllowed = false;

8
modules/gui/src/com/haulmont/cuba/gui/commonlookup/CommonLookupController.java
View File

@ -16,7 +16,9 @@
package com.haulmont.cuba.gui.commonlookup;
import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.cuba.core.global.*;
import com.haulmont.cuba.core.global.MessageTools;
import com.haulmont.cuba.core.global.View;
import com.haulmont.cuba.core.global.ViewRepository;
import com.haulmont.cuba.gui.WindowParam;
import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.data.CollectionDatasource;
@ -34,10 +36,6 @@ public class CommonLookupController extends AbstractLookup {
@Inject
protected ComponentsFactory componentsFactory;
@Inject
protected Metadata metadata;
@Inject
protected MetadataTools metadataTools;
@Inject
protected ViewRepository viewRepository;
@Inject
protected ThemeConstantsManager themeConstantsManager;

11
modules/gui/src/com/haulmont/cuba/gui/components/FieldGroupFieldFactoryImpl.java
View File

@ -30,9 +30,7 @@ import com.haulmont.cuba.core.entity.CategoryAttribute;
import com.haulmont.cuba.core.entity.FileDescriptor;
import com.haulmont.cuba.core.entity.annotation.CurrencyValue;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.MessageTools;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.core.global.MetadataTools;
import com.haulmont.cuba.gui.ComponentsHelper;
import com.haulmont.cuba.gui.WindowManager;
import com.haulmont.cuba.gui.data.CollectionDatasource;
@ -50,18 +48,9 @@ public class FieldGroupFieldFactoryImpl implements FieldGroupFieldFactory {
@Inject
protected Messages messages;
@Inject
protected MetadataTools metadataTools;
@Inject
protected MessageTools messageTools;
@Inject
protected ComponentsFactory componentsFactory;
@Inject
protected DynamicAttributesGuiTools dynamicAttributesGuiTools;
@Override
public GeneratedField createField(FieldGroup.FieldConfig fc) {
return createFieldComponent(fc);

5
modules/gui/src/com/haulmont/cuba/gui/components/filter/addcondition/AddConditionWindow.java
View File

@ -29,7 +29,6 @@ import com.haulmont.cuba.gui.components.filter.descriptor.HeaderConditionDescrip
import com.haulmont.cuba.gui.components.filter.descriptor.PropertyConditionDescriptor;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import com.haulmont.cuba.gui.theme.ThemeConstantsManager;
import com.haulmont.cuba.gui.xml.layout.ComponentsFactory;
import javax.inject.Inject;
import java.util.Collection;
@ -39,13 +38,9 @@ import java.util.UUID;
/**
* Window for adding new filter condition
*
*/
public class AddConditionWindow extends AbstractWindow {
@Inject
protected ComponentsFactory componentsFactory;
@Inject
protected ConditionDescriptorsDs conditionDescriptorsDs;

5
modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/CustomConditionEditor.java
View File

@ -17,7 +17,6 @@
package com.haulmont.cuba.gui.components.filter.edit;
import com.haulmont.cuba.client.ClientConfig;
import com.haulmont.cuba.gui.components.AbstractFrame;
import com.haulmont.cuba.gui.components.AbstractWindow;
import com.haulmont.cuba.gui.components.Component;
@ -27,16 +26,12 @@ import javax.inject.Inject;
import java.util.Map;
public class CustomConditionEditor extends AbstractWindow {
@Inject
private CustomConditionFrame customConditionFrame;
@Inject
protected ThemeConstants theme;
@Inject
protected ClientConfig clientConfig;
@Override
public void init(Map<String, Object> params) {
super.init(params);

10
modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/CustomConditionFrame.java
View File

@ -19,7 +19,6 @@ package com.haulmont.cuba.gui.components.filter.edit;
import com.google.common.base.Strings;
import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.cuba.core.entity.annotation.SystemLevel;
import com.haulmont.cuba.core.global.*;
import com.haulmont.cuba.core.sys.jpql.DomainModel;
import com.haulmont.cuba.core.sys.jpql.DomainModelBuilder;
@ -87,15 +86,6 @@ public class CustomConditionFrame extends ConditionFrame<CustomCondition> {
@Inject
protected Label nameLab;
@Inject
protected Metadata metadata;
@Inject
protected MessageTools messageTools;
@Inject
protected ExtendedEntities extendedEntities;
protected boolean initializing;
protected ConditionsTree conditionsTree;

4
modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/DynamicAttributesConditionEditor.java
View File

@ -20,7 +20,6 @@ package com.haulmont.cuba.gui.components.filter.edit;
import com.haulmont.cuba.gui.components.AbstractFrame;
import com.haulmont.cuba.gui.components.AbstractWindow;
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import javax.inject.Inject;
import java.util.Map;
@ -30,9 +29,6 @@ public class DynamicAttributesConditionEditor extends AbstractWindow {
@Inject
protected DynamicAttributesConditionFrame dynamicAttributesConditionFrame;
@Inject
protected ThemeConstants theme;
@Override
public void init(Map<String, Object> params) {
super.init(params);

15
modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/DynamicAttributesConditionFrame.java
View File

@ -20,25 +20,22 @@ package com.haulmont.cuba.gui.components.filter.edit;
import com.google.common.base.Strings;
import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.chile.core.model.MetaPropertyPath;
import com.haulmont.cuba.core.app.DataService;
import com.haulmont.cuba.core.app.dynamicattributes.DynamicAttributes;
import com.haulmont.cuba.core.app.dynamicattributes.DynamicAttributesUtils;
import com.haulmont.cuba.core.entity.Category;
import com.haulmont.cuba.core.entity.CategoryAttribute;
import com.haulmont.cuba.core.entity.Entity;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.MessageTools;
import com.haulmont.cuba.core.global.Metadata;
import com.haulmont.cuba.core.global.ReferenceToEntitySupport;
import com.haulmont.cuba.core.global.filter.Op;
import com.haulmont.cuba.core.global.filter.OpManager;
import com.haulmont.cuba.gui.components.Frame;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.LookupField;
import com.haulmont.cuba.gui.components.filter.ConditionParamBuilder;
import com.haulmont.cuba.core.global.filter.OpManager;
import com.haulmont.cuba.gui.components.filter.Param;
import com.haulmont.cuba.gui.components.filter.condition.DynamicAttributesCondition;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.RandomStringUtils;
@ -47,13 +44,6 @@ import javax.inject.Inject;
import java.util.*;
public class DynamicAttributesConditionFrame extends ConditionFrame<DynamicAttributesCondition> {
@Inject
protected ThemeConstants themeConstants;
@Inject
protected DataService dataService;
@Inject
protected Metadata metadata;
@ -69,9 +59,6 @@ public class DynamicAttributesConditionFrame extends ConditionFrame<DynamicAttri
@Inject
protected Label categoryLabel;
@Inject
protected MessageTools messageTools;
@Inject
protected ReferenceToEntitySupport referenceToEntitySupport;

8
modules/gui/src/com/haulmont/cuba/gui/components/filter/operationedit/PropertyOperationEditor.java
View File

@ -17,23 +17,20 @@
package com.haulmont.cuba.gui.components.filter.operationedit;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.core.global.filter.Op;
import com.haulmont.cuba.core.global.filter.OpManager;
import com.haulmont.cuba.gui.components.AbstractAction;
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.PopupButton;
import com.haulmont.cuba.core.global.filter.Op;
import com.haulmont.cuba.core.global.filter.OpManager;
import com.haulmont.cuba.gui.components.filter.condition.AbstractCondition;
import com.haulmont.cuba.gui.xml.layout.ComponentsFactory;
/**
* Operation editor for PropertyCondition. Displays popupButton component for selecting an operation.
*
*/
public class PropertyOperationEditor extends AbstractOperationEditor {
protected ComponentsFactory componentsFactory;
protected Messages messages;
protected PopupButton popupButton;
public PropertyOperationEditor(AbstractCondition condition) {
@ -43,7 +40,6 @@ public class PropertyOperationEditor extends AbstractOperationEditor {
@Override
protected Component createComponent() {
componentsFactory = AppBeans.get(ComponentsFactory.class);
messages = AppBeans.get(Messages.NAME);
popupButton = componentsFactory.createComponent(PopupButton.class);
OpManager opManager = AppBeans.get(OpManager.class);

3
modules/gui/src/com/haulmont/cuba/gui/dynamicattributes/DynamicAttributesGuiTools.java
View File

@ -55,9 +55,6 @@ public class DynamicAttributesGuiTools {
@Inject
protected DynamicAttributes dynamicAttributes;
@Inject
protected MetadataTools metadataTools;
@Inject
protected WindowConfig windowConfig;

2
modules/gui/src/com/haulmont/cuba/gui/exception/AbstractGenericExceptionHandler.java
View File

@ -72,7 +72,7 @@ public abstract class AbstractGenericExceptionHandler implements GenericExceptio
*
* @param className exception class name
* @param message exception message
* @param throwable exception instance. Can be null if the exception occured on the server side and this
* @param throwable exception instance. Can be null if the exception occurred on the server side and this
* exception class isn't accessible by the client.
* @return true if the exception can be handled by this handler
*/

2
modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/AbstractTableLoader.java
View File

@ -19,7 +19,6 @@ package com.haulmont.cuba.gui.xml.layout.loaders;
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.app.dynamicattributes.DynamicAttributes;
import com.haulmont.cuba.core.app.dynamicattributes.DynamicAttributesUtils;
import com.haulmont.cuba.core.app.dynamicattributes.PropertyType;
import com.haulmont.cuba.core.entity.CategoryAttribute;
@ -51,7 +50,6 @@ public abstract class AbstractTableLoader<T extends Table> extends ActionsHolder
protected MetadataTools metadataTools = AppBeans.get(MetadataTools.NAME);
protected DynamicAttributesGuiTools dynamicAttributesGuiTools = AppBeans.get(DynamicAttributesGuiTools.NAME);
protected DynamicAttributes dynamicAttributes = AppBeans.get(DynamicAttributes.NAME);
protected ComponentLoader buttonsPanelLoader;
protected Element panelElement;

2
modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/DataGridLoader.java
View File

@ -19,7 +19,6 @@ package com.haulmont.cuba.gui.xml.layout.loaders;
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.app.dynamicattributes.DynamicAttributes;
import com.haulmont.cuba.core.app.dynamicattributes.DynamicAttributesUtils;
import com.haulmont.cuba.core.entity.CategoryAttribute;
import com.haulmont.cuba.core.global.AppBeans;
@ -51,7 +50,6 @@ public class DataGridLoader extends ActionsHolderLoader<DataGrid> {
protected MetadataTools metadataTools = AppBeans.get(MetadataTools.NAME);
protected DynamicAttributesGuiTools dynamicAttributesGuiTools = AppBeans.get(DynamicAttributesGuiTools.NAME);
protected DynamicAttributes dynamicAttributes = AppBeans.get(DynamicAttributes.NAME);
protected ComponentLoader buttonsPanelLoader;
protected Element panelElement;

2
modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/FieldGroupLoader.java
View File

@ -22,7 +22,6 @@ import com.haulmont.bali.util.Dom4j;
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.app.dynamicattributes.DynamicAttributes;
import com.haulmont.cuba.core.app.dynamicattributes.DynamicAttributesUtils;
import com.haulmont.cuba.core.entity.CategoryAttribute;
import com.haulmont.cuba.core.global.AppBeans;
@ -54,7 +53,6 @@ import static com.haulmont.bali.util.Preconditions.checkNotNullArgument;
public class FieldGroupLoader extends AbstractComponentLoader<FieldGroup> {
protected DynamicAttributes dynamicAttributes = AppBeans.get(DynamicAttributes.class);
protected DynamicAttributesGuiTools dynamicAttributesGuiTools = AppBeans.get(DynamicAttributesGuiTools.class);
protected MetadataTools metadataTools = AppBeans.get(MetadataTools.class);

4
modules/web-auth/src/com/haulmont/cuba/web/auth/IdpAuthProvider.java
View File

@ -21,7 +21,6 @@ import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
import com.haulmont.bali.util.URLEncodeUtils;
import com.haulmont.cuba.core.global.GlobalConfig;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.core.global.UserSessionSource;
import com.haulmont.cuba.security.app.IdpService;
import com.haulmont.cuba.security.app.LoginService;
@ -71,9 +70,6 @@ public class IdpAuthProvider implements CubaAuthProvider {
protected Lock sessionCheckLock = new ReentrantLock();
@Inject
protected Messages messages;
@Inject
protected WebAuthConfig webAuthConfig;

4
modules/web/src/com/haulmont/cuba/web/app/ui/core/settings/SettingsWindow.java
View File

@ -21,7 +21,6 @@ import com.haulmont.cuba.client.ClientConfig;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.GlobalConfig;
import com.haulmont.cuba.core.global.TimeZones;
import com.haulmont.cuba.core.global.UserSessionSource;
import com.haulmont.cuba.gui.WindowManager.OpenType;
import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.components.actions.BaseAction;
@ -89,9 +88,6 @@ public class SettingsWindow extends AbstractWindow {
@Inject
protected CheckBox timeZoneAutoField;
@Inject
protected UserSessionSource userSessionSource;
@Override
public void init(Map<String, Object> params) {
Boolean changeThemeEnabledParam = (Boolean) params.get("changeThemeEnabled");

9
modules/web/src/com/haulmont/cuba/web/gui/components/WebFilterHelper.java
View File

@ -21,8 +21,6 @@ import com.haulmont.bali.datastruct.Node;
import com.haulmont.cuba.core.entity.AbstractSearchFolder;
import com.haulmont.cuba.core.entity.Folder;
import com.haulmont.cuba.core.global.Configuration;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.core.global.Metadata;
import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.components.filter.ConditionsTree;
import com.haulmont.cuba.gui.components.filter.FilterHelper;
@ -55,13 +53,6 @@ import java.util.*;
@org.springframework.stereotype.Component(FilterHelper.NAME)
public class WebFilterHelper implements FilterHelper {
@Inject
protected Metadata metadata;
@Inject
protected Messages messages;
@Inject
protected Configuration configuration;

4
modules/web/src/com/haulmont/cuba/web/sys/MenuBuilder.java
View File

@ -24,7 +24,6 @@ import com.haulmont.cuba.gui.components.mainwindow.AppMenu;
import com.haulmont.cuba.gui.config.MenuCommand;
import com.haulmont.cuba.gui.config.MenuConfig;
import com.haulmont.cuba.gui.config.MenuItem;
import com.haulmont.cuba.gui.config.WindowConfig;
import com.haulmont.cuba.security.global.UserSession;
import com.haulmont.cuba.web.toolkit.MenuShortcutAction;
import com.vaadin.event.ShortcutListener;
@ -54,9 +53,6 @@ public class MenuBuilder {
@Inject
protected MenuConfig menuConfig;
@Inject
protected WindowConfig windowConfig;
@Inject
protected MessageTools messageTools;

8
modules/web/src/com/haulmont/cuba/web/sys/SideMenuBuilder.java
View File

@ -25,13 +25,10 @@ import com.haulmont.cuba.gui.components.mainwindow.SideMenu;
import com.haulmont.cuba.gui.config.MenuCommand;
import com.haulmont.cuba.gui.config.MenuConfig;
import com.haulmont.cuba.gui.config.MenuItem;
import com.haulmont.cuba.gui.config.WindowConfig;
import com.haulmont.cuba.security.global.UserSession;
import com.vaadin.event.ShortcutListener;
import com.vaadin.ui.AbstractComponent;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
@ -51,17 +48,12 @@ import static com.haulmont.cuba.gui.components.KeyCombination.getShortcutModifie
public class SideMenuBuilder {
public static final String NAME = "cuba_SideMenuBuilder";
private final Logger log = LoggerFactory.getLogger(SideMenuBuilder.class);
@Inject
protected UserSession session;
@Inject
protected MenuConfig menuConfig;
@Inject
protected WindowConfig windowConfig;
@Inject
private MessageTools messageTools;