Merge branch 'feature/9.0' of http://cloud.finedevelop.com:2015/scm/~plough/design into feature/9.0

designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java

@@ -11,11 +11,6 @@ import com.fr.stable.fun.mark.API;
 @API(level = TemplateTreeShortCutProvider.CURRENT_LEVEL)
 public abstract class AbstractTemplateTreeShortCutProvider extends UpdateAction implements TemplateTreeShortCutProvider {
 
-    @Override
-    public int currentAPILevel() {
-        return 1;
-    }
-
     @Override
     public String mark4Provider() {
         return getClass().getName();

designer_base/src/com/fr/design/locale/designer.properties

@@ -1994,7 +1994,7 @@ FR-Designer_AlphaFine_EnableInternetSearch=SearchOnLine
 FR-Designer_AlphaFine_Shortcut_Config=Shortcut Config
 FR-Designer_AlphaFine_SearchRange=Search Range
 FR-Designer_AlphaFine_Recommend=Recommend
-FR-Designer-Plugin_Addon=Plugin Addon
+FR-Designer-Plugin_Addon=FanRuan Market
 FR-Designer_Templates=FR-Designer_Templates
 FR-Designer_Templates_Content=Templates Contents
 FR-Designer_AlphaFine_ShowAll=show all

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -1992,7 +1992,7 @@ FR-Designer_AlphaFine_EnableInternetSearch=Search OnLine
 FR-Designer_AlphaFine_Shortcut_Config=Shortcut Config
 FR-Designer_AlphaFine_SearchRange=Search Range
 FR-Designer_AlphaFine_Recommend=Recommend
-FR-Designer-Plugin_Addon=Plugin Addon
+FR-Designer-Plugin_Addon=FanRuan Market
 FR-Designer_Templates=Files
 FR-Designer_Templates_Content=Files'contents
 FR-Designer_AlphaFine_ShowAll=Show all

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -1994,7 +1994,7 @@ FR-Designer_AlphaFine_EnableInternet=\u8054\u7F51
 FR-Designer_AlphaFine_EnableInternetSearch=\u8054\u7F51\u641C\u7D22
 FR-Designer_AlphaFine_Shortcut_Config=\u5FEB\u6377\u952E\u914D\u7F6E
 FR-Designer_AlphaFine_SearchRange=\u641C\u7D22\u8303\u56F4
-FR-Designer-Plugin_Addon=\u5E94\u7528\u4E2D\u5FC3
+FR-Designer-Plugin_Addon=\u5E06\u8F6F\u5E02\u573A
 FR-Designer_Templates=\u6A21\u677F
 FR-Designer_Templates_Content=\u6A21\u677F\u5185\u5BB9
 FR-Designer_AlphaFine_ShowAll=\u663E\u793A\u5168\u90E8

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -1992,7 +1992,7 @@ FR-Designer_AlphaFine_EnableInternetSearch=\u806F\u7DB2\u641C\u7D22
 FR-Designer_AlphaFine_Shortcut_Config=\u5FEB\u6377\u9375\u914D\u7F6E
 FR-Designer_AlphaFine_SearchRange=\u641C\u7D22\u7BC4\u570D
 FR-Designer_AlphaFine_Recommend=\u731C\u60A8\u9700\u8981
-FR-Designer-Plugin_Addon=\u61C9\u7528\u4E2D\u5FC3
+FR-Designer-Plugin_Addon=\u5E06\u8EDF\u5E02\u5834
 FR-Designer_Templates=\u6A21\u677F
 FR-Designer_Templates_Content=\u6A21\u677F\u5167\u5BB9
 FR-Designer_AlphaFine_Latest=\u6700\u8FD1\u5E38\u7528

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

@@ -10,7 +10,11 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.data.tabledata.ResponseDataSourceChange;
-import com.fr.design.file.*;
+import com.fr.design.file.FileOperations;
+import com.fr.design.file.FileToolbarStateChangeListener;
+import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIMenuHighLight;
@@ -41,6 +45,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -51,6 +56,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
     private CardLayout card;
     private JPanel cardPane;
+    private java.util.List<FileToolbarStateChangeListener> otherToobarStateChangeListeners= new ArrayList<>();
 
     public FileOperations getSelectedOperation() {
         return selectedOperation;
@@ -137,7 +143,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         }
         toolbarDef.addShortCut(delFileAction);
         Set<ShortCut> extraShortCuts = ExtraDesignClassManager.getInstance().getExtraShortCuts();
-        for (ShortCut shortCut : extraShortCuts){
+        for (ShortCut shortCut : extraShortCuts) {
             toolbarDef.addShortCut(shortCut);
         }
 
@@ -164,6 +170,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
     /**
      * 响应数据集改变
+     *
      * @param map 改变名字的数据集
      */
     public void fireDSChanged(Map<String, String> map) {
@@ -215,6 +222,21 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public void actionPerformed(ActionEvent evt) {
             selectedOperation.refresh();
             stateChange();
+
+        }
+    }
+
+    public void addToobarStateChangeListener(FileToolbarStateChangeListener toobarStateChangeListener) {
+        this.otherToobarStateChangeListeners.add(toobarStateChangeListener);
+    }
+
+    public void removeToobarStateChangeListener(FileToolbarStateChangeListener toobarStateChangeListener) {
+        this.otherToobarStateChangeListeners.remove(toobarStateChangeListener);
+    }
+
+    private void otherStateChange() {
+        for (FileToolbarStateChangeListener toobarStateChangeListener : otherToobarStateChangeListeners) {
+            toobarStateChangeListener.stateChange();
         }
     }
 
@@ -298,8 +320,8 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                     openReportAction.setEnabled(false);
                 }
                 FileNode node = TemplateTreePane.getInstance().getTemplateFileTree().getSelectedFileNode();
-                if (selectedOperation.getSelectedTemplatePath() != null){
-                    if (node.getLock() != null && !ComparatorUtils.equals(node.getUserID(),node.getLock())){
+                if (selectedOperation.getSelectedTemplatePath() != null) {
+                    if (node.getLock() != null && !ComparatorUtils.equals(node.getUserID(), node.getLock())) {
                         delFileAction.setEnabled(false);
                     } else {
                         delFileAction.setEnabled(true);
@@ -332,6 +354,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             delFileAction.setEnabled(true);
         }
 
+        otherStateChange();
     }
 
     /**