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 6c50632482e8ac9ca4e061fc475fb3a832de4bfb..7a8426072c68ca189438cd0d9074963837326c78 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java
+++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java
@@ -443,18 +443,25 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
        /**
         * Renders data of basic company data
         * <p>
-        * @param basicData Basic company data instance
+        * @param basicData    Basic company data instance
+        * @param useShortName Whether to use short name or long name of company
         * <p>
         * @return Basic company data as string
         */
-       public String renderBasicData (final BasicData basicData) {
+       public String renderBasicData (final BasicData basicData, final boolean useShortName) {
                // Default is empty string, so let's get started
                final StringBuilder sb = new StringBuilder(30);
 
                // Is basic company data set?
                if (basicData instanceof BasicData) {
-                       // Add company name
-                       sb.append(basicData.getCompanyName()); //NOI18N
+                       // Short or long name?
+                       if (useShortName) {
+                               // Add company's long name
+                               sb.append(basicData.getCompanyShortName()); //NOI18N
+                       } else {
+                               // Add company's long name
+                               sb.append(basicData.getCompanyName()); //NOI18N
+                       }
 
                        // Is email address set?
                        if (basicData.getCompanyEmailAddress() != null) {
@@ -491,7 +498,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
                        assert (branchOffice.getBranchCompany() instanceof BasicData) : "branchOffice.branchCompany is null"; //NOI18N
 
                        // Yes, then append all data
-                       sb.append(branchOffice.getBranchCompany().getCompanyName());
+                       sb.append(this.renderBasicData(branchOffice.getBranchCompany(), true));
                        sb.append(", "); //NOI18N
                        sb.append(branchOffice.getBranchStreet());
                        sb.append(" "); //NOI18N
@@ -576,7 +583,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe
                        // Then create name
                        sb.append(this.getMessageFromBundle(department.getDepartmentI18nKey()));
                        sb.append(" ("); //NOI18N
-                       sb.append(department.getDepartmentCompany().getCompanyName());
+                       sb.append(this.renderBasicData(department.getDepartmentCompany(), true));
                        sb.append(")"); //NOI18N
                }