Merge pull request #1332 in BA/design from ~XIAOXIA/design:release/9.0 to release/9.0

* commit '3ad5ecf3df555c6e176b4ce86345ec7f03fd7f84':
  RT
  RT
  RT
  REPORT-4851 [9.0插件]搜索bug信息，前台接口被AlphaFine智能搜索占了

designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java

@@ -21,6 +21,7 @@ public class AlphaFinePane extends BasicPane {
     private static AlphaFinePane alphaFinePane;
 
     public AlphaFinePane() {
+        setPreferredSize(new Dimension(24,24));
         setLayout(new BorderLayout());
         if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
             Toolkit.getDefaultToolkit().addAWTEventListener(AlphaFineDialog.listener(), AWTEvent.KEY_EVENT_MASK);

designer_base/src/com/fr/design/mainframe/DesignerFrame.java

@@ -10,7 +10,6 @@ import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
@@ -27,7 +26,6 @@ import com.fr.design.gui.imenu.UIMenuHighLight;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
 import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.hold.DefaultTitlePlace;
 import com.fr.design.mainframe.loghandler.LogMessageBar;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
@@ -233,11 +231,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         basePane.add(centerPane, BorderLayout.CENTER);
         laoyoutWestPane();
-//		JPanel eastRegionPane = new JPanel(new BorderLayout());
-//		eastRegionPane.add(EastRegionContainerPane.getInstance(), BorderLayout.CENTER);
-//		eastRegionPane.add(JSliderPane.getInstance(), BorderLayout.SOUTH);
-//		basePane.add(eastRegionPane, BorderLayout.EAST);
-
         basePane.add(EastRegionContainerPane.getInstance(), BorderLayout.EAST);
         basePane.setBounds(0, 0, contentWidth, contentHeight);
 
@@ -332,16 +325,17 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     }
 
     private void refreshNorthEastPane(JPanel northEastPane, ToolBarMenuDock ad) {
-
         northEastPane.removeAll();
+        northEastPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 0, 0));
+        northEastPane.add(LogMessageBar.getInstance());
         TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING);
-        if (processor == null) {
-            processor = new DefaultTitlePlace();
+        if (processor != null) {
+            processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane());
         }
-        processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane());
         if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
-            northEastPane.add(ad.createAlphaFinePane(), BorderLayout.CENTER);
+            northEastPane.add(ad.createAlphaFinePane());
         }
+        northEastPane.add(ad.createBBSLoginPane());
     }
 
 

designer_base/src/com/fr/design/mainframe/hold/DefaultTitlePlace.java

@@ -1,14 +0,0 @@
-package com.fr.design.mainframe.hold;
-
-import com.fr.design.fun.impl.AbstractTitleProcessor;
-
-import java.awt.*;
-
-public class DefaultTitlePlace extends AbstractTitleProcessor {
-
-    @Override
-    public void hold(Container container, Component loggerComponent, Component loginComponent) {
-        container.add(loggerComponent, BorderLayout.WEST);
-        container.add(loginComponent, BorderLayout.EAST);
-    }
-}