From da7d3c3e69ed6a841f7497110dd155676a56e359 Mon Sep 17 00:00:00 2001 From: author Date: Mon, 23 Sep 2019 09:57:35 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-20549=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E6=94=B9=E8=BF=9B=EF=BC=88=E8=AE=BE=E8=AE=A1=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=8A=A0=E4=B8=8A=E8=A7=92=E8=89=B2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/remote/constants/MemberIcon.java | 14 ++++++++++++++ .../list/cell/AddedCustomRoleListCellRender.java | 3 ++- .../ui/list/cell/AddedUserListCellRender.java | 3 ++- .../list/cell/AddingCustomRoleListCellRender.java | 3 ++- .../ui/list/cell/AddingUserListCellRender.java | 3 ++- .../cell/AuthorityCustomRoleListCellRender.java | 3 ++- .../ui/list/cell/AuthorityUserListCellRender.java | 3 ++- 7 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/remote/constants/MemberIcon.java diff --git a/designer-base/src/main/java/com/fr/design/remote/constants/MemberIcon.java b/designer-base/src/main/java/com/fr/design/remote/constants/MemberIcon.java new file mode 100644 index 000000000..ccf1e66fd --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/remote/constants/MemberIcon.java @@ -0,0 +1,14 @@ +package com.fr.design.remote.constants; + +/** + * @author Lucian.Chen + * @version 10.0 + * Created by Lucian.Chen on 2019/9/23 + */ +public class MemberIcon { + + public static final String CUSTOM_ROLE_ICON = "com/fr/design/remote/images/icon_Custom_Role_normal@1x.png"; + + public static final String USER_ICON = "com/fr/design/remote/images/icon_Member_normal@1x.png"; + +} diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddedCustomRoleListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddedCustomRoleListCellRender.java index 55b558852..9680f6336 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddedCustomRoleListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddedCustomRoleListCellRender.java @@ -1,6 +1,7 @@ package com.fr.design.remote.ui.list.cell; import com.fr.base.BaseUtils; +import com.fr.design.remote.constants.MemberIcon; import com.fr.design.remote.ui.list.AddedMemberListCellRender; import com.fr.workspace.server.authority.RemoteDesignMember; @@ -14,7 +15,7 @@ import javax.swing.Icon; public class AddedCustomRoleListCellRender extends AddedMemberListCellRender { @Override protected Icon getMemberIcon() { - return BaseUtils.readIcon("com/fr/design/remote/images/icon_Custom_Role_normal@1x.png"); + return BaseUtils.readIcon(MemberIcon.CUSTOM_ROLE_ICON); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddedUserListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddedUserListCellRender.java index e848547b5..2a78e2a03 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddedUserListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddedUserListCellRender.java @@ -1,6 +1,7 @@ package com.fr.design.remote.ui.list.cell; import com.fr.base.BaseUtils; +import com.fr.design.remote.constants.MemberIcon; import com.fr.design.remote.ui.list.AddedMemberListCellRender; import com.fr.workspace.server.authority.RemoteDesignMember; @@ -14,7 +15,7 @@ import javax.swing.Icon; public class AddedUserListCellRender extends AddedMemberListCellRender { @Override protected Icon getMemberIcon() { - return BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png"); + return BaseUtils.readIcon(MemberIcon.USER_ICON); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddingCustomRoleListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddingCustomRoleListCellRender.java index 3de4569d6..fa51f201e 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddingCustomRoleListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddingCustomRoleListCellRender.java @@ -1,6 +1,7 @@ package com.fr.design.remote.ui.list.cell; import com.fr.base.BaseUtils; +import com.fr.design.remote.constants.MemberIcon; import com.fr.design.remote.ui.list.AddingMemberListCellRender; import com.fr.workspace.server.authority.RemoteDesignMember; @@ -14,7 +15,7 @@ import javax.swing.Icon; public class AddingCustomRoleListCellRender extends AddingMemberListCellRender { @Override protected Icon getMemberIcon() { - return BaseUtils.readIcon("com/fr/design/remote/images/icon_Custom_Role_normal@1x.png"); + return BaseUtils.readIcon(MemberIcon.CUSTOM_ROLE_ICON); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddingUserListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddingUserListCellRender.java index dda8fc70a..1df731afc 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddingUserListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AddingUserListCellRender.java @@ -1,6 +1,7 @@ package com.fr.design.remote.ui.list.cell; import com.fr.base.BaseUtils; +import com.fr.design.remote.constants.MemberIcon; import com.fr.design.remote.ui.list.AddingMemberListCellRender; import com.fr.workspace.server.authority.RemoteDesignMember; @@ -14,7 +15,7 @@ import javax.swing.Icon; public class AddingUserListCellRender extends AddingMemberListCellRender { @Override protected Icon getMemberIcon() { - return BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png"); + return BaseUtils.readIcon(MemberIcon.USER_ICON); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AuthorityCustomRoleListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AuthorityCustomRoleListCellRender.java index 6bec15a33..ece2a8a2c 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AuthorityCustomRoleListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AuthorityCustomRoleListCellRender.java @@ -1,6 +1,7 @@ package com.fr.design.remote.ui.list.cell; import com.fr.base.BaseUtils; +import com.fr.design.remote.constants.MemberIcon; import com.fr.design.remote.ui.list.AuthorityListCellRenderer; import com.fr.report.DesignAuthority; @@ -14,7 +15,7 @@ import javax.swing.Icon; public class AuthorityCustomRoleListCellRender extends AuthorityListCellRenderer { @Override protected Icon getMemberIcon() { - return BaseUtils.readIcon("com/fr/design/remote/images/icon_Custom_Role_normal@1x.png"); + return BaseUtils.readIcon(MemberIcon.CUSTOM_ROLE_ICON); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AuthorityUserListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AuthorityUserListCellRender.java index 82b1afeb8..9b04a4441 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AuthorityUserListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/cell/AuthorityUserListCellRender.java @@ -1,6 +1,7 @@ package com.fr.design.remote.ui.list.cell; import com.fr.base.BaseUtils; +import com.fr.design.remote.constants.MemberIcon; import com.fr.design.remote.ui.list.AuthorityListCellRenderer; import com.fr.report.DesignAuthority; @@ -14,7 +15,7 @@ import javax.swing.Icon; public class AuthorityUserListCellRender extends AuthorityListCellRenderer { @Override protected Icon getMemberIcon() { - return BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png"); + return BaseUtils.readIcon(MemberIcon.USER_ICON); } @Override