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

Move dev and security packages to com.haulmont.cuba.gui.app.core #PL-5311

Browse Source
This commit is contained in:
Yuriy Artamonov 2015-04-24 13:43:46 +00:00
parent bbca95d666
commit 12bd06bf57
57 changed files with 116 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/desktop/src/com/haulmont/cuba/desktop/app/security/role/AttributePermissionsFrameCompanion.java
View File

@ -11,9 +11,9 @@ import com.haulmont.cuba.gui.app.security.role.edit.tabs.AttributePermissionsFra
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.security.entity.AttributeTarget;
import com.haulmont.cuba.gui.security.entity.MultiplePermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.AttributeTarget;
import com.haulmont.cuba.gui.app.security.entity.MultiplePermissionTarget;
import javax.swing.*;
import java.util.Iterator;

5
modules/desktop/src/com/haulmont/cuba/desktop/app/security/role/EntityPermissionsFrameCompanion.java
View File

@ -6,7 +6,6 @@
package com.haulmont.cuba.desktop.app.security.role;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.MessageProvider;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.desktop.gui.components.DesktopComponentsHelper;
import com.haulmont.cuba.gui.AppConfig;
@ -14,8 +13,8 @@ import com.haulmont.cuba.gui.app.security.role.edit.tabs.EntityPermissionsFrame;
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.security.entity.OperationPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.OperationPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import javax.swing.*;

5
modules/desktop/src/com/haulmont/cuba/desktop/app/security/role/ScreenPermissionsFrameCompanion.java
View File

@ -6,7 +6,6 @@
package com.haulmont.cuba.desktop.app.security.role;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.MessageProvider;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.desktop.gui.components.DesktopComponentsHelper;
import com.haulmont.cuba.gui.AppConfig;
@ -15,8 +14,8 @@ import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.components.TreeTable;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import javax.swing.*;

5
modules/desktop/src/com/haulmont/cuba/desktop/app/security/role/SpecificPermissionsFrameCompanion.java
View File

@ -6,7 +6,6 @@
package com.haulmont.cuba.desktop.app.security.role;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.MessageProvider;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.desktop.gui.components.DesktopComponentsHelper;
import com.haulmont.cuba.gui.AppConfig;
@ -15,8 +14,8 @@ import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.components.TreeTable;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import javax.swing.*;

5
modules/desktop/src/com/haulmont/cuba/desktop/app/security/role/UiPermissionsFrameCompanion.java
View File

@ -6,7 +6,6 @@
package com.haulmont.cuba.desktop.app.security.role;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.MessageProvider;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.desktop.gui.components.DesktopComponentsHelper;
import com.haulmont.cuba.gui.AppConfig;
@ -14,8 +13,8 @@ import com.haulmont.cuba.gui.app.security.role.edit.tabs.UiPermissionsFrame;
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.security.entity.UiPermissionTarget;
import com.haulmont.cuba.gui.security.entity.UiPermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.UiPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.UiPermissionVariant;
import javax.swing.*;

4
modules/desktop/src/com/haulmont/cuba/desktop/sys/DesktopWindowManager.java
View File

@ -22,13 +22,13 @@ import com.haulmont.cuba.desktop.sys.validation.ValidationAlertHolder;
import com.haulmont.cuba.desktop.sys.validation.ValidationAwareAction;
import com.haulmont.cuba.desktop.sys.validation.ValidationAwareWindowClosingListener;
import com.haulmont.cuba.gui.*;
import com.haulmont.cuba.gui.app.core.dev.LayoutAnalyzer;
import com.haulmont.cuba.gui.app.core.dev.LayoutTip;
import com.haulmont.cuba.gui.components.Action;
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.components.Window;
import com.haulmont.cuba.gui.config.WindowInfo;
import com.haulmont.cuba.gui.dev.LayoutAnalyzer;
import com.haulmont.cuba.gui.dev.LayoutTip;
import com.haulmont.cuba.gui.executors.*;
import com.haulmont.cuba.gui.settings.SettingsImpl;
import net.miginfocom.layout.LC;

6
modules/gui/src/com/haulmont/cuba/gui/dev/LayoutAnalyzer.java → modules/gui/src/com/haulmont/cuba/gui/app/core/dev/LayoutAnalyzer.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.dev;
package com.haulmont.cuba.gui.app.core.dev;
import com.haulmont.cuba.gui.ComponentVisitor;
import com.haulmont.cuba.gui.ComponentsHelper;
@ -15,8 +15,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static com.haulmont.cuba.gui.dev.LayoutTip.error;
import static com.haulmont.cuba.gui.dev.LayoutTip.warn;
import static com.haulmont.cuba.gui.app.core.dev.LayoutTip.error;
import static com.haulmont.cuba.gui.app.core.dev.LayoutTip.warn;
import static com.haulmont.cuba.gui.components.ExpandingLayout.ExpandDirection;
/**

2
modules/gui/src/com/haulmont/cuba/gui/dev/LayoutAnalyzerWindow.java → modules/gui/src/com/haulmont/cuba/gui/app/core/dev/LayoutAnalyzerWindow.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.dev;
package com.haulmont.cuba.gui.app.core.dev;
import com.haulmont.cuba.gui.WindowParam;
import com.haulmont.cuba.gui.components.AbstractWindow;

2
modules/gui/src/com/haulmont/cuba/gui/dev/LayoutTip.java → modules/gui/src/com/haulmont/cuba/gui/app/core/dev/LayoutTip.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.dev;
package com.haulmont.cuba.gui.app.core.dev;
/**
* @author artamonov

2
modules/gui/src/com/haulmont/cuba/gui/dev/LayoutTipType.java → modules/gui/src/com/haulmont/cuba/gui/app/core/dev/LayoutTipType.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.dev;
package com.haulmont.cuba.gui.app.core.dev;
/**
* @author artamonov

2
modules/gui/src/com/haulmont/cuba/gui/dev/layout-analyzer.xml → modules/gui/src/com/haulmont/cuba/gui/app/core/dev/layout-analyzer.xml
View File

@ -4,7 +4,7 @@
-->
<window xmlns="http://schemas.haulmont.com/cuba/5.4/window.xsd"
class="com.haulmont.cuba.gui.dev.LayoutAnalyzerWindow"
class="com.haulmont.cuba.gui.app.core.dev.LayoutAnalyzerWindow"
caption="msg://caption">
<layout expand="analyzeResultBox" spacing="true">
<textArea id="analyzeResultBox" width="100%"/>

0
modules/gui/src/com/haulmont/cuba/gui/dev/messages.properties → modules/gui/src/com/haulmont/cuba/gui/app/core/dev/messages.properties
View File

0
modules/gui/src/com/haulmont/cuba/gui/dev/messages_ru.properties → modules/gui/src/com/haulmont/cuba/gui/app/core/dev/messages_ru.properties
View File

6
modules/gui/src/com/haulmont/cuba/gui/security/BasicPermissionTreeDatasource.java → modules/gui/src/com/haulmont/cuba/gui/app/security/ds/BasicPermissionTreeDatasource.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security;
package com.haulmont.cuba.gui.app.security.ds;
import com.haulmont.bali.datastruct.Node;
import com.haulmont.bali.datastruct.Tree;
@ -11,8 +11,8 @@ import com.haulmont.cuba.gui.app.security.role.edit.PermissionValue;
import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.impl.AbstractTreeDatasource;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import org.apache.commons.lang.ObjectUtils;
import java.util.ArrayList;

6
modules/gui/src/com/haulmont/cuba/gui/security/EntityPermissionTargetsDatasource.java → modules/gui/src/com/haulmont/cuba/gui/app/security/ds/EntityPermissionTargetsDatasource.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security;
package com.haulmont.cuba.gui.app.security.ds;
import com.google.common.base.Predicate;
import com.haulmont.cuba.core.global.AppBeans;
@ -12,8 +12,8 @@ import com.haulmont.cuba.gui.app.security.role.edit.PermissionValue;
import com.haulmont.cuba.gui.config.PermissionConfig;
import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.impl.CollectionDatasourceImpl;
import com.haulmont.cuba.gui.security.entity.OperationPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.OperationPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import com.haulmont.cuba.security.entity.EntityOp;
import com.haulmont.cuba.security.entity.Permission;
import org.apache.commons.lang.StringUtils;

6
modules/gui/src/com/haulmont/cuba/gui/security/MultiplePermissionTargetsDatasource.java → modules/gui/src/com/haulmont/cuba/gui/app/security/ds/MultiplePermissionTargetsDatasource.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security;
package com.haulmont.cuba.gui.app.security.ds;
import com.google.common.base.Predicate;
import com.haulmont.cuba.core.global.AppBeans;
@ -13,8 +13,8 @@ import com.haulmont.cuba.gui.config.PermissionConfig;
import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.impl.CollectionDatasourceImpl;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.gui.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.security.entity.MultiplePermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.MultiplePermissionTarget;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;

2
modules/gui/src/com/haulmont/cuba/gui/security/RestorablePermissionDatasource.java → modules/gui/src/com/haulmont/cuba/gui/app/security/ds/RestorablePermissionDatasource.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security;
package com.haulmont.cuba.gui.app.security.ds;
import com.google.common.base.Predicate;
import com.haulmont.cuba.gui.data.impl.CollectionDatasourceImpl;

4
modules/gui/src/com/haulmont/cuba/gui/security/ScreenPermissionTreeDatasource.java → modules/gui/src/com/haulmont/cuba/gui/app/security/ds/ScreenPermissionTreeDatasource.java
View File

@ -3,13 +3,13 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security;
package com.haulmont.cuba.gui.app.security.ds;
import com.haulmont.bali.datastruct.Tree;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.UserSessionSource;
import com.haulmont.cuba.gui.config.PermissionConfig;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
/**
* @author artamonov

4
modules/gui/src/com/haulmont/cuba/gui/security/SpecificPermissionTreeDatasource.java → modules/gui/src/com/haulmont/cuba/gui/app/security/ds/SpecificPermissionTreeDatasource.java
View File

@ -3,13 +3,13 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security;
package com.haulmont.cuba.gui.app.security.ds;
import com.haulmont.bali.datastruct.Tree;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.UserSessionSource;
import com.haulmont.cuba.gui.config.PermissionConfig;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
/**
* @author abramov

6
modules/gui/src/com/haulmont/cuba/gui/security/UiPermissionsDatasource.java → modules/gui/src/com/haulmont/cuba/gui/app/security/ds/UiPermissionsDatasource.java
View File

@ -3,13 +3,13 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security;
package com.haulmont.cuba.gui.app.security.ds;
import com.haulmont.cuba.gui.app.security.role.edit.UiPermissionValue;
import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.impl.GroupDatasourceImpl;
import com.haulmont.cuba.gui.security.entity.UiPermissionTarget;
import com.haulmont.cuba.gui.security.entity.UiPermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.UiPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.UiPermissionVariant;
import com.haulmont.cuba.security.entity.Permission;
import org.apache.commons.lang.StringUtils;

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/AbstractPermissionTarget.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/AbstractPermissionTarget.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
import com.haulmont.chile.core.annotations.MetaProperty;
import com.haulmont.chile.core.model.MetaClass;

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/AssignableTarget.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/AssignableTarget.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
/**
* @author artamonov

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/AttributePermissionVariant.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/AttributePermissionVariant.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
import com.haulmont.chile.core.datatypes.impl.EnumClass;
import org.apache.commons.lang.ObjectUtils;

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/AttributeTarget.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/AttributeTarget.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
import com.haulmont.chile.core.annotations.MetaProperty;
import com.haulmont.chile.core.model.MetaClass;

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/BasicPermissionTarget.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/BasicPermissionTarget.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
import com.haulmont.chile.core.annotations.MetaProperty;
import com.haulmont.cuba.core.entity.annotation.SystemLevel;

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/EntityPermissionTarget.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/EntityPermissionTarget.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
/**
* @author krivopustov

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/MultiplePermissionTarget.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/MultiplePermissionTarget.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
import com.haulmont.chile.core.annotations.MetaProperty;
import com.haulmont.cuba.core.entity.annotation.SystemLevel;

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/OperationPermissionTarget.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/OperationPermissionTarget.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
import com.haulmont.chile.core.annotations.MetaProperty;
import com.haulmont.cuba.core.entity.annotation.SystemLevel;

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/PermissionVariant.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/PermissionVariant.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
import com.haulmont.chile.core.datatypes.impl.EnumClass;
import org.apache.commons.lang.ObjectUtils;

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/UiPermissionTarget.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/UiPermissionTarget.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
import com.haulmont.chile.core.annotations.MetaProperty;
import com.haulmont.cuba.core.entity.annotation.SystemLevel;

2
modules/gui/src/com/haulmont/cuba/gui/security/entity/UiPermissionVariant.java → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/UiPermissionVariant.java
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
package com.haulmont.cuba.gui.security.entity;
package com.haulmont.cuba.gui.app.security.entity;
import com.haulmont.chile.core.datatypes.impl.EnumClass;
import org.apache.commons.lang.ObjectUtils;

0
modules/gui/src/com/haulmont/cuba/gui/security/entity/messages.properties → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/messages.properties
View File

0
modules/gui/src/com/haulmont/cuba/gui/security/entity/messages_fr.properties → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/messages_fr.properties
View File

0
modules/gui/src/com/haulmont/cuba/gui/security/entity/messages_ru.properties → modules/gui/src/com/haulmont/cuba/gui/app/security/entity/messages_ru.properties
View File

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

@ -7,8 +7,8 @@ package com.haulmont.cuba.gui.app.security.role.edit;
import com.haulmont.cuba.core.entity.Entity;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
/**
* <p>$Id$</p>

8
modules/gui/src/com/haulmont/cuba/gui/app/security/role/edit/PermissionUiHelper.java
View File

@ -8,10 +8,10 @@ package com.haulmont.cuba.gui.app.security.role.edit;
import com.google.common.base.Predicate;
import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.security.RestorablePermissionDatasource;
import com.haulmont.cuba.gui.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.security.entity.UiPermissionVariant;
import com.haulmont.cuba.gui.app.security.ds.RestorablePermissionDatasource;
import com.haulmont.cuba.gui.app.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.UiPermissionVariant;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.security.entity.PermissionType;
import com.haulmont.cuba.security.entity.Role;

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

@ -13,11 +13,11 @@ import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.data.ValueListener;
import com.haulmont.cuba.gui.data.impl.CollectionDsListenerAdapter;
import com.haulmont.cuba.gui.security.MultiplePermissionTargetsDatasource;
import com.haulmont.cuba.gui.security.RestorablePermissionDatasource;
import com.haulmont.cuba.gui.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.security.entity.AttributeTarget;
import com.haulmont.cuba.gui.security.entity.MultiplePermissionTarget;
import com.haulmont.cuba.gui.app.security.ds.MultiplePermissionTargetsDatasource;
import com.haulmont.cuba.gui.app.security.ds.RestorablePermissionDatasource;
import com.haulmont.cuba.gui.app.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.AttributeTarget;
import com.haulmont.cuba.gui.app.security.entity.MultiplePermissionTarget;
import com.haulmont.cuba.gui.xml.layout.ComponentsFactory;
import com.haulmont.cuba.security.entity.EntityOp;
import com.haulmont.cuba.security.entity.Permission;

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

@ -10,8 +10,8 @@ import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.cuba.core.global.Metadata;
import com.haulmont.cuba.gui.components.CheckBox;
import com.haulmont.cuba.gui.components.TextField;
import com.haulmont.cuba.gui.security.entity.AssignableTarget;
import com.haulmont.cuba.gui.security.entity.EntityPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.AssignableTarget;
import com.haulmont.cuba.gui.app.security.entity.EntityPermissionTarget;
import org.apache.commons.lang.StringUtils;
import javax.annotation.Nullable;

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

@ -12,10 +12,10 @@ import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.data.ValueListener;
import com.haulmont.cuba.gui.data.impl.CollectionDsListenerAdapter;
import com.haulmont.cuba.gui.security.EntityPermissionTargetsDatasource;
import com.haulmont.cuba.gui.security.RestorablePermissionDatasource;
import com.haulmont.cuba.gui.security.entity.OperationPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.ds.EntityPermissionTargetsDatasource;
import com.haulmont.cuba.gui.app.security.ds.RestorablePermissionDatasource;
import com.haulmont.cuba.gui.app.security.entity.OperationPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import com.haulmont.cuba.security.entity.EntityOp;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.security.entity.PermissionType;

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

@ -14,9 +14,9 @@ import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.data.ValueListener;
import com.haulmont.cuba.gui.data.impl.CollectionDsListenerAdapter;
import com.haulmont.cuba.gui.security.ScreenPermissionTreeDatasource;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.ds.ScreenPermissionTreeDatasource;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import com.haulmont.cuba.security.entity.EntityOp;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.security.entity.PermissionType;

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

@ -17,9 +17,9 @@ import com.haulmont.cuba.gui.data.CollectionDatasource;
import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.data.ValueListener;
import com.haulmont.cuba.gui.data.impl.CollectionDsListenerAdapter;
import com.haulmont.cuba.gui.security.SpecificPermissionTreeDatasource;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.ds.SpecificPermissionTreeDatasource;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import com.haulmont.cuba.security.entity.EntityOp;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.security.entity.PermissionType;

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

@ -17,10 +17,10 @@ import com.haulmont.cuba.gui.config.WindowInfo;
import com.haulmont.cuba.gui.data.Datasource;
import com.haulmont.cuba.gui.data.ValueListener;
import com.haulmont.cuba.gui.data.impl.CollectionDsListenerAdapter;
import com.haulmont.cuba.gui.security.RestorablePermissionDatasource;
import com.haulmont.cuba.gui.security.UiPermissionsDatasource;
import com.haulmont.cuba.gui.security.entity.UiPermissionTarget;
import com.haulmont.cuba.gui.security.entity.UiPermissionVariant;
import com.haulmont.cuba.gui.app.security.ds.RestorablePermissionDatasource;
import com.haulmont.cuba.gui.app.security.ds.UiPermissionsDatasource;
import com.haulmont.cuba.gui.app.security.entity.UiPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.UiPermissionVariant;
import com.haulmont.cuba.security.entity.EntityOp;
import com.haulmont.cuba.security.entity.Permission;
import com.haulmont.cuba.security.entity.PermissionType;

6
modules/gui/src/com/haulmont/cuba/gui/app/security/role/edit/tabs/attributes-permission-tab.xml
View File

@ -16,15 +16,15 @@
<collectionDatasource id="propertyPermissionsDs"
class="com.haulmont.cuba.security.entity.Permission"
view="role.edit"
datasourceClass="com.haulmont.cuba.gui.security.RestorablePermissionDatasource">
datasourceClass="com.haulmont.cuba.gui.app.security.ds.RestorablePermissionDatasource">
<query>select p from sec$Permission p where p.role.id = :ds$roleDs and p.type = 30</query>
</collectionDatasource>
<collectionDatasource id="attributeTargetsDs"
class="com.haulmont.cuba.gui.security.entity.MultiplePermissionTarget"
class="com.haulmont.cuba.gui.app.security.entity.MultiplePermissionTarget"
allowCommit="false"
view="_local"
datasourceClass="com.haulmont.cuba.gui.security.MultiplePermissionTargetsDatasource">
datasourceClass="com.haulmont.cuba.gui.app.security.ds.MultiplePermissionTargetsDatasource">
</collectionDatasource>
</dsContext>

6
modules/gui/src/com/haulmont/cuba/gui/app/security/role/edit/tabs/entities-permission-tab.xml
View File

@ -16,15 +16,15 @@
<collectionDatasource id="entityPermissionsDs"
class="com.haulmont.cuba.security.entity.Permission"
view="role.edit"
datasourceClass="com.haulmont.cuba.gui.security.RestorablePermissionDatasource">
datasourceClass="com.haulmont.cuba.gui.app.security.ds.RestorablePermissionDatasource">
<query>select p from sec$Permission p where p.role.id = :ds$roleDs and p.type = 20</query>
</collectionDatasource>
<collectionDatasource id="entityTargetsDs"
class="com.haulmont.cuba.gui.security.entity.OperationPermissionTarget"
class="com.haulmont.cuba.gui.app.security.entity.OperationPermissionTarget"
allowCommit="false"
view="_local"
datasourceClass="com.haulmont.cuba.gui.security.EntityPermissionTargetsDatasource"/>
datasourceClass="com.haulmont.cuba.gui.app.security.ds.EntityPermissionTargetsDatasource"/>
</dsContext>
<layout expand="contentPane">

6
modules/gui/src/com/haulmont/cuba/gui/app/security/role/edit/tabs/screens-permission-tab.xml
View File

@ -16,15 +16,15 @@
<collectionDatasource id="screenPermissionsDs"
class="com.haulmont.cuba.security.entity.Permission"
view="role.edit"
datasourceClass="com.haulmont.cuba.gui.security.RestorablePermissionDatasource">
datasourceClass="com.haulmont.cuba.gui.app.security.ds.RestorablePermissionDatasource">
<query>select p from sec$Permission p where p.role.id = :ds$roleDs and p.type = 10</query>
</collectionDatasource>
<collectionDatasource id="screenPermissionsTreeDs"
class="com.haulmont.cuba.gui.security.entity.BasicPermissionTarget"
class="com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget"
allowCommit="false"
view="_local"
datasourceClass="com.haulmont.cuba.gui.security.ScreenPermissionTreeDatasource">
datasourceClass="com.haulmont.cuba.gui.app.security.ds.ScreenPermissionTreeDatasource">
</collectionDatasource>
</dsContext>

6
modules/gui/src/com/haulmont/cuba/gui/app/security/role/edit/tabs/specific-permission-tab.xml
View File

@ -16,15 +16,15 @@
<collectionDatasource id="specificPermissionsDs"
class="com.haulmont.cuba.security.entity.Permission"
view="role.edit"
datasourceClass="com.haulmont.cuba.gui.security.RestorablePermissionDatasource">
datasourceClass="com.haulmont.cuba.gui.app.security.ds.RestorablePermissionDatasource">
<query>select p from sec$Permission p where p.role.id = :ds$roleDs and p.type = 40</query>
</collectionDatasource>
<collectionDatasource id="specificPermissionsTreeDs"
class="com.haulmont.cuba.gui.security.entity.BasicPermissionTarget"
class="com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget"
allowCommit="false"
view="_local"
datasourceClass="com.haulmont.cuba.gui.security.SpecificPermissionTreeDatasource">
datasourceClass="com.haulmont.cuba.gui.app.security.ds.SpecificPermissionTreeDatasource">
</collectionDatasource>
</dsContext>

6
modules/gui/src/com/haulmont/cuba/gui/app/security/role/edit/tabs/ui-permission-tab.xml
View File

@ -16,15 +16,15 @@
<collectionDatasource id="uiPermissionsDs"
class="com.haulmont.cuba.security.entity.Permission"
view="role.edit"
datasourceClass="com.haulmont.cuba.gui.security.RestorablePermissionDatasource">
datasourceClass="com.haulmont.cuba.gui.app.security.ds.RestorablePermissionDatasource">
<query>select p from sec$Permission p where p.role.id = :ds$roleDs and p.type = 50</query>
</collectionDatasource>
<groupDatasource id="uiPermissionTargetsDs"
class="com.haulmont.cuba.gui.security.entity.UiPermissionTarget"
class="com.haulmont.cuba.gui.app.security.entity.UiPermissionTarget"
allowCommit="false"
view="_local"
datasourceClass="com.haulmont.cuba.gui.security.UiPermissionsDatasource">
datasourceClass="com.haulmont.cuba.gui.app.security.ds.UiPermissionsDatasource">
</groupDatasource>
</dsContext>

10
modules/gui/src/com/haulmont/cuba/gui/config/PermissionConfig.java
View File

@ -14,12 +14,10 @@ import com.haulmont.cuba.core.entity.CategoryAttribute;
import com.haulmont.cuba.core.global.*;
import com.haulmont.cuba.core.sys.AppContext;
import com.haulmont.cuba.gui.AppConfig;
import com.haulmont.cuba.gui.dynamicattributes.DynamicAttributesGuiTools;
import com.haulmont.cuba.gui.security.entity.AttributeTarget;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.MultiplePermissionTarget;
import com.haulmont.cuba.gui.security.entity.OperationPermissionTarget;
import org.apache.commons.collections.CollectionUtils;
import com.haulmont.cuba.gui.app.security.entity.AttributeTarget;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.MultiplePermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.OperationPermissionTarget;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;

2
modules/gui/src/com/haulmont/cuba/gui/cuba-screens.xml
View File

@ -143,7 +143,7 @@
template="/com/haulmont/cuba/gui/app/core/bulk/bulk-edit.xml"/>
<screen id="layoutAnalyzer"
template="/com/haulmont/cuba/gui/dev/layout-analyzer.xml"/>
template="/com/haulmont/cuba/gui/app/core/dev/layout-analyzer.xml"/>
<screen id="filterEditor"
template="/com/haulmont/cuba/gui/components/filter/edit/filter-edit.xml"/>

12
modules/gui/src/cuba-gui-metadata.xml
View File

@ -8,12 +8,12 @@
<metadata-model root-package="com.haulmont.cuba">
<class>com.haulmont.cuba.gui.app.core.showinfo.KeyValueEntity</class>
<class>com.haulmont.cuba.gui.security.entity.AbstractPermissionTarget</class>
<class>com.haulmont.cuba.gui.security.entity.AttributeTarget</class>
<class>com.haulmont.cuba.gui.security.entity.BasicPermissionTarget</class>
<class>com.haulmont.cuba.gui.security.entity.MultiplePermissionTarget</class>
<class>com.haulmont.cuba.gui.security.entity.OperationPermissionTarget</class>
<class>com.haulmont.cuba.gui.security.entity.UiPermissionTarget</class>
<class>com.haulmont.cuba.gui.app.security.entity.AbstractPermissionTarget</class>
<class>com.haulmont.cuba.gui.app.security.entity.AttributeTarget</class>
<class>com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget</class>
<class>com.haulmont.cuba.gui.app.security.entity.MultiplePermissionTarget</class>
<class>com.haulmont.cuba.gui.app.security.entity.OperationPermissionTarget</class>
<class>com.haulmont.cuba.gui.app.security.entity.UiPermissionTarget</class>
<class>com.haulmont.cuba.gui.components.filter.condition.AbstractCondition</class>
<class>com.haulmont.cuba.gui.components.filter.condition.PropertyCondition</class>

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

@ -13,12 +13,12 @@ import com.haulmont.cuba.core.entity.Entity;
import com.haulmont.cuba.core.global.*;
import com.haulmont.cuba.gui.AppConfig;
import com.haulmont.cuba.gui.WindowManager;
import com.haulmont.cuba.gui.app.core.dev.LayoutAnalyzer;
import com.haulmont.cuba.gui.app.core.dev.LayoutTip;
import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.components.Window;
import com.haulmont.cuba.gui.config.WindowConfig;
import com.haulmont.cuba.gui.config.WindowInfo;
import com.haulmont.cuba.gui.dev.LayoutAnalyzer;
import com.haulmont.cuba.gui.dev.LayoutTip;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import com.haulmont.cuba.gui.theme.ThemeConstantsRepository;
import com.haulmont.cuba.gui.xml.layout.ComponentsFactory;

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

@ -11,12 +11,12 @@ import com.haulmont.cuba.core.global.Configuration;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.core.global.SilentException;
import com.haulmont.cuba.gui.*;
import com.haulmont.cuba.gui.app.core.dev.LayoutAnalyzer;
import com.haulmont.cuba.gui.app.core.dev.LayoutTip;
import com.haulmont.cuba.gui.components.*;
import com.haulmont.cuba.gui.components.Action;
import com.haulmont.cuba.gui.components.Window;
import com.haulmont.cuba.gui.config.WindowInfo;
import com.haulmont.cuba.gui.dev.LayoutAnalyzer;
import com.haulmont.cuba.gui.dev.LayoutTip;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import com.haulmont.cuba.web.gui.WebWindow;
import com.haulmont.cuba.web.gui.components.WebAbstractComponent;

6
modules/web/src/com/haulmont/cuba/web/app/ui/security/role/AttributePermissionsFrameCompanion.java
View File

@ -10,9 +10,9 @@ import com.haulmont.cuba.gui.app.security.role.edit.tabs.AttributePermissionsFra
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.security.entity.AttributeTarget;
import com.haulmont.cuba.gui.security.entity.MultiplePermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.AttributePermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.AttributeTarget;
import com.haulmont.cuba.gui.app.security.entity.MultiplePermissionTarget;
import com.haulmont.cuba.web.gui.components.WebComponentsUtils;
import java.util.Iterator;

4
modules/web/src/com/haulmont/cuba/web/app/ui/security/role/EntityPermissionsFrameCompanion.java
View File

@ -12,8 +12,8 @@ import com.haulmont.cuba.gui.app.security.role.edit.tabs.EntityPermissionsFrame;
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.security.entity.OperationPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.OperationPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import com.haulmont.cuba.web.gui.components.WebComponentsUtils;
/**

4
modules/web/src/com/haulmont/cuba/web/app/ui/security/role/ScreenPermissionsFrameCompanion.java
View File

@ -13,8 +13,8 @@ import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.components.TreeTable;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import com.haulmont.cuba.web.gui.components.WebComponentsUtils;
/**

4
modules/web/src/com/haulmont/cuba/web/app/ui/security/role/SpecificPermissionsFrameCompanion.java
View File

@ -13,8 +13,8 @@ import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.components.TreeTable;
import com.haulmont.cuba.gui.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.security.entity.PermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.BasicPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.PermissionVariant;
import com.haulmont.cuba.web.gui.components.WebComponentsUtils;
/**

4
modules/web/src/com/haulmont/cuba/web/app/ui/security/role/UiPermissionsFrameCompanion.java
View File

@ -12,8 +12,8 @@ import com.haulmont.cuba.gui.app.security.role.edit.tabs.UiPermissionsFrame;
import com.haulmont.cuba.gui.components.Component;
import com.haulmont.cuba.gui.components.Label;
import com.haulmont.cuba.gui.components.Table;
import com.haulmont.cuba.gui.security.entity.UiPermissionTarget;
import com.haulmont.cuba.gui.security.entity.UiPermissionVariant;
import com.haulmont.cuba.gui.app.security.entity.UiPermissionTarget;
import com.haulmont.cuba.gui.app.security.entity.UiPermissionVariant;
import com.haulmont.cuba.web.gui.components.WebComponentsUtils;
/**