Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / beans / helper / JobsWebViewHelperBean.java

diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java
index ac672e7917ce11711a4a30edd0e4178041c87407..4c6361f4ac4aabc4a60e36ef9eecdf239eea576d 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java
+++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java
@@ -32,8 +32,8 @@ import org.mxchange.jcontactsbusiness.model.employee.Employable;
 import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jjobs.beans.BaseJobsBean;
+import org.mxchange.jjobs.beans.contact.list.JobsContactListWebViewController;
 import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController;
-import org.mxchange.jjobs.beans.user.JobsUserWebRequestController;
 import org.mxchange.jphone.events.fax.created.CreatedFaxNumberEvent;
 import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent;
 import org.mxchange.jphone.events.landline.created.CreatedLandLineNumberEvent;
@@ -78,7 +78,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
         * Regular user controller
         */
        @Inject
-       private FinancialsContactListWebViewController contactListController;
+       private JobsContactListWebViewController contactListController;
 
        /**
         * Fax number
@@ -443,12 +443,13 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
        /**
         * Renders data of basic company data
         * <p>
-        * @param basicData    Basic company data instance
-        * @param useShortName Whether to use short name or long name of company
+        * @param basicData        Basic company data instance
+        * @param useShortName     Whether to use short name or long name of company
+        * @param showEmailAddress Whether render email address
         * <p>
         * @return Basic company data as string
         */
-       public String renderBasicData (final BasicData basicData, final boolean useShortName) {
+       public String renderBasicData (final BasicData basicData, final boolean useShortName, final boolean showEmailAddress) {
                // Default is empty string, so let's get started
                final StringBuilder sb = new StringBuilder(30);
 
@@ -464,7 +465,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
                        }
 
                        // Is email address set?
-                       if (basicData.getCompanyEmailAddress() != null) {
+                       if (showEmailAddress && basicData.getCompanyEmailAddress() != null) {
                                // Add it
                                sb.append(", ").append(basicData.getCompanyEmailAddress()); //NOI18N
                        }
@@ -484,11 +485,12 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
         * Returns the branch office's full address. If null is provided, an empty
         * string is returned.
         * <p>
-        * @param branchOffice Branch office instance
+        * @param branchOffice     Branch office instance
+        * @param showEmailAddress Whether render email address
         * <p>
         * @return Branch office's address
         */
-       public String renderBranchOffice (final BranchOffice branchOffice) {
+       public String renderBranchOffice (final BranchOffice branchOffice, final boolean showEmailAddress) {
                // Default is empty string, so let's get started
                final StringBuilder sb = new StringBuilder(30);
 
@@ -510,7 +512,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
                        }
 
                        // Yes, then append all data
-                       sb.append(this.renderBasicData(branchOffice.getBranchCompany(), true));
+                       sb.append(this.renderBasicData(branchOffice.getBranchCompany(), true, showEmailAddress));
                        sb.append(", "); //NOI18N
                        sb.append(branchOffice.getBranchStreet());
                        sb.append(" "); //NOI18N
@@ -582,11 +584,12 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
         * Returns the department's name and name of assigned company. If null is
         * provided, an empty string is returned.
         * <p>
-        * @param department Department instance
+        * @param department       Department instance
+        * @param showEmailAddress Whether to render email address
         * <p>
         * @return Department's full name
         */
-       public String renderDepartment (final Department department) {
+       public String renderDepartment (final Department department, final boolean showEmailAddress) {
                // Default is empty string, so let's get started
                final StringBuilder sb = new StringBuilder(10);
 
@@ -595,7 +598,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
                        // Then create name
                        sb.append(this.getMessageFromBundle(department.getDepartmentI18nKey()));
                        sb.append(" ("); //NOI18N
-                       sb.append(this.renderBasicData(department.getDepartmentCompany(), true));
+                       sb.append(this.renderBasicData(department.getDepartmentCompany(), true, showEmailAddress));
                        sb.append(")"); //NOI18N
                }
 
@@ -607,11 +610,12 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
         * Returns the employee's number, personal title, family name and name if
         * available. If null is provided, an empty string is returned.
         * <p>
-        * @param employee Employable instance
+        * @param employee         Employable instance
+        * @param showEmailAddress Whether to show email address of employee
         * <p>
         * @return A string representing an employee
         */
-       public String renderEmployee (final Employable employee) {
+       public String renderEmployee (final Employable employee, final boolean showEmailAddress) {
                // Default is empty string, so let's get started
                final StringBuilder sb = new StringBuilder(20);
 
@@ -653,7 +657,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
                                }
 
                                // Add department name
-                               sb.append(this.renderDepartment(employee.getEmployeeDepartment()));
+                               sb.append(this.renderDepartment(employee.getEmployeeDepartment(), showEmailAddress));
 
                                // Only add braces when employee number is given
                                if (employee.getEmployeeNumber() != null || employee.getEmployeePersonalData() instanceof Contact) {