Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0

designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java

@@ -4,6 +4,7 @@ import com.fr.base.TemplateUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.EncodeConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import javafx.application.Platform;
@@ -32,6 +33,9 @@ import java.util.Map;
 public class PluginWebPane extends JFXPanel {
     private static final String RESOURCE_URL = "resourceURL";
     private static final String LANGUAGE = "language";
+    private static final String URL_PLUS = "+";
+    private static final String URL_SPACING = "%20";
+    private static final String URL_PREFIX = "file:///";
     private WebEngine webEngine;
 
     public PluginWebPane(final String installHome, final String mainJs) {
@@ -75,8 +79,9 @@ public class PluginWebPane extends JFXPanel {
         StringBuffer sb = new StringBuffer();
         String line;
         Map<String, Object> map4Tpl = new HashMap<String, Object>();
-
+        //URL中关于空格的编码与空格所在位置相关：空格被编码成+的情况只能在查询字符串部分出现，而被编码成%20则可以出现在路径和查询字符串中
-        map4Tpl.put(RESOURCE_URL, "file:///" + URLEncoder.encode(installHome, "UTF-8"));
+        //URLEncoder会将空格转成+,这边需要+转成%20
+        map4Tpl.put(RESOURCE_URL, URL_PREFIX + URLEncoder.encode(installHome, EncodeConstants.ENCODING_UTF_8).replace(URL_PLUS, URL_SPACING));
         map4Tpl.put(LANGUAGE, GeneralContext.getLocale().toString());
         while ((line = read.readLine()) != null) {
             if (sb.length() > 0) {

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -152,8 +152,9 @@ public class ChartTypePane extends AbstractChartAttrPane{
 
             try{
                 Chart newDefaultChart = (Chart)((AbstractChartTypePane)getSelectedPane()).getDefaultChart().clone();
-                if(!chart.accept(newDefaultChart.getClass())){
+				if (!ComparatorUtils.equals(chart.getClass(), newDefaultChart.getClass())) {
-                    //vanChart 和 chart 之间切换
+					//vanChart 和 chart 之间切换
+					//不同chart之间切换
                     editingCollection.removeNameObject(editingCollection.getSelectedIndex());
                     editingCollection.addChart(newDefaultChart);
                     chart = newDefaultChart;

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -936,7 +936,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      */
     @Override
     public PreviewProvider[] supportPreview() {
-        return new PreviewProvider[]{new FormPreview()};
+        return new PreviewProvider[]{new FormPreview(), new MobilePreview()};
     }
 
     /**

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -52,6 +52,7 @@ import com.fr.design.menu.ToolBarDef;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.parameter.ParameterDefinitePane;
 import com.fr.design.parameter.ParameterInputPane;
+import com.fr.design.preview.MobilePreview;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.preview.ViewPreview;
 import com.fr.design.preview.WriteEnhancePreview;
@@ -889,7 +890,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     public PreviewProvider[] supportPreview() {
         Set<PreviewProvider> set = ExtraDesignClassManager.getInstance().getArray(PreviewProvider.MARK_STRING);
         return ArrayUtils.addAll(new PreviewProvider[]{
-                new PagePreview(), new WritePreview(), new ViewPreview(), new WriteEnhancePreview()
+                new PagePreview(), new WritePreview(), new ViewPreview(), new WriteEnhancePreview(), new MobilePreview()
         }, set.toArray(new PreviewProvider[set.size()]));
     }
 

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java

@@ -2,9 +2,11 @@ package com.fr.design.mainframe.alphafine;
 
 import com.fr.base.extension.FileExtension;
 import com.fr.general.CloudCenter;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
+import java.util.ArrayList;
 
 
 /**
@@ -49,7 +51,7 @@ public class AlphaFineConstants {
 
     public static final Dimension HOT_ICON_LABEL_SIZE = new Dimension(36, 36);
 
-    public static final Dimension HOT_ISSUES_JAPNEL_SIZE = new Dimension(213,182);
+    public static final Dimension HOT_ISSUES_JAPNEL_SIZE = new Dimension(213, 182);
 
     public static final Dimension CLOSE_BUTTON_SIZE = new Dimension(40, 40);
 
@@ -83,7 +85,7 @@ public class AlphaFineConstants {
 
     public static final String IMAGE_URL = "/com/fr/design/mainframe/alphafine/images/";
 
-    public static final String ALPHA_HOT_IMAGE_NAME  = "alphafine_hot";
+    public static final String ALPHA_HOT_IMAGE_NAME = "alphafine_hot";
 
     public static final String PLUGIN_SEARCH_URL = CloudCenter.getInstance().acquireUrlByKind("plugin.searchAPI");
 
@@ -134,8 +136,16 @@ public class AlphaFineConstants {
 
     public static final String FIRST_PAGE = "-1";
 
-    public static final FileExtension[] FILE_EXTENSIONS= new FileExtension[]{FileExtension.CPT, FileExtension.FRM};
+    public static final FileExtension[] FILE_EXTENSIONS = new FileExtension[]{FileExtension.CPT, FileExtension.FRM};
 
     public static final int RECOMMEND_MAX_ITEM_NUM = 3;
 
+    public static final String BACK_ICON_NAME = "back@1x.png";
+
+    public static final ArrayList<String> CONJUNCTION = new ArrayList<String>() {{
+        add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Conjunction_HE"));
+        add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Conjunction_YU"));
+        add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Conjunction_DE"));
+    }};
+
 }

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/BottomCellRender.java

@@ -24,7 +24,7 @@ public class BottomCellRender implements ListCellRenderer<Object> {
 
         JPanel line = new JPanel();
         line.setPreferredSize(new Dimension(200, 1));
-        line.setBackground(AlphaFineConstants.GRAY);
+        line.setBackground(AlphaFineConstants.WHITE);
         panel.add(line, BorderLayout.NORTH);
 
         goToWebLabel.setFont(AlphaFineConstants.MEDIUM_FONT);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@@ -239,20 +239,21 @@ public class AlphaFineDialog extends UIDialog {
         hotPane.setLayout(new BorderLayout());
 
         UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Hot"));
+        uiLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
         uiLabel.setFont(AlphaFineConstants.SMALL_FONT);
         uiLabel.setForeground(AlphaFineConstants.DARK_GRAY);
 
         GridLayout gridLayout = new GridLayout(2, 3, 3, 3);
         JPanel panel = new JPanel();
         panel.setLayout(gridLayout);
-        if(AlphaFineHelper.isNetworkOk()) {
+        if (AlphaFineHelper.isNetworkOk()) {
             if (hotData == null) {
                 hotData = HotIssuesManager.getInstance().getHotIssues();
             }
             for (int i = 0; i < hotData.length; i++) {
                 panel.add(new HotIssueJpanel(hotData[i], i + 1));
             }
-        }else {
+        } else {
             hotData = null;
             for (int i = 0; i < AlphaFineConstants.HOT_ITEMS; i++) {
                 panel.add(new HotIssueJpanel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Connection_Failed")}, i + 1));
@@ -947,7 +948,7 @@ public class AlphaFineDialog extends UIDialog {
         Thread sendThread = new Thread(new Runnable() {
             @Override
             public void run() {
-                if(StringUtils.isNotEmpty(storeText)){
+                if (StringUtils.isNotEmpty(storeText)) {
                     RecentSearchManager searchManager = RecentSearchManager.getInstance();
                     searchManager.addModel(storeText, cellModel);
                     sendDataToServer(storeText, cellModel);
@@ -1377,7 +1378,9 @@ public class AlphaFineDialog extends UIDialog {
      */
     private void initBackPane() {
         backPane = new JPanel(new BorderLayout());
-        JLabel jLabel = new JLabel("  <  " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Back"));
+        JLabel jLabel = new JLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Back"));
+        jLabel.setIcon(IconLoader.getIcon(AlphaFineConstants.IMAGE_URL + AlphaFineConstants.BACK_ICON_NAME));
+        jLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
         jLabel.setPreferredSize(new Dimension(80, 20));
         jLabel.setFont(AlphaFineConstants.SMALL_FONT);
         jLabel.setForeground(AlphaFineConstants.DARK_GRAY);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java

@@ -2,7 +2,6 @@ package com.fr.design.mainframe.alphafine.search.manager.impl;
 
 import com.fr.design.mainframe.alphafine.AlphaFineConstants;
 import com.fr.stable.StringUtils;
-
 import com.fr.third.ibm.icu.text.BreakIterator;
 
 import java.util.ArrayList;
@@ -72,7 +71,8 @@ public class SegmentationManager {
         int start = itor.first();
         for (int end = itor.next(); end != BreakIterator.DONE; start = end, end = itor.next()) {
             String temp = searchText.substring(start, end);
-            if (!StringUtils.isEmpty(temp)) {
+            //去掉空和连词
+            if (StringUtils.isNotEmpty(temp) && !AlphaFineConstants.CONJUNCTION.contains(temp)) {
                 result.add(temp);
             }
         }

designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java

@@ -7,6 +7,7 @@ import com.fr.event.Listener;
 import com.fr.module.Activator;
 import com.fr.record.analyzer.EnableMetrics;
 import com.fr.record.analyzer.Metrics;
+import com.fr.runtime.FineRuntime;
 import com.fr.start.Designer;
 import com.fr.start.ServerStarter;
 import com.fr.start.SplashContext;
@@ -63,7 +64,7 @@ public class DesignerStartup extends Activator {
     
         DesignerContext.getDesignerFrame().getProgressDialog().setVisible(true);
         startSub(StartFinishActivator.class);
-    
+        FineRuntime.startFinish();
     }
     
     private void browserDemo() {