Merge pull request #179 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit '70e3022e160d2f2039205185f8ef56d69b8ad1bd':
  代碼修改
  REPORT-9277 【10.0一轮回归】服务器配置是否显示工具栏无效

designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java

@@ -15,6 +15,9 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.webattr.printsettings.PrintSettingPane;
 import com.fr.general.Inter;
 import com.fr.report.core.ReportUtils;
+import com.fr.report.web.WebPage;
+import com.fr.report.web.WebView;
+import com.fr.report.web.WebWrite;
 import com.fr.web.attr.ReportWebAttr;
 
 import javax.swing.*;
@@ -74,13 +77,20 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
 //                File.separator + reportServerPreferenceConfig.fileName());
 
         webAttr = ((ReportWebAttr) ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class));
-        if (webAttr != null) {
+        WebPage webPage = webAttr.getWebPage();
-        	pagePane.populateBean(webAttr.getWebPage());
+        WebView webView = webAttr.getWebView();
-        	viewPane.populateBean(webAttr.getWebView());
+        WebWrite webWrite = webAttr.getWebWrite();
-        	writePane.populateBean(webAttr.getWebWrite());
+        if(webPage != null){
-        	cssPane.populate(webAttr);
+            pagePane.populateBean(webPage);
-        	jsPane.populate(webAttr);
         }
+        if(webView != null){
+            viewPane.populateBean(webView);
+        }
+        if(webWrite != null){
+            writePane.populateBean(webWrite);
+        }
+        cssPane.populate(webAttr);
+        jsPane.populate(webAttr);
         printSettings = ReportUtils.getPrintSettingsFromServerConfig();
         printSettingPane.populate(printSettings);