Merge pull request #693 in BA/design from ~YAOH.WU/design:dev to dev

* commit 'd38c4fdc1da30b1867bb4d4e472b332e1153bb5c':
  无jira任务 调整代码
  无jira任务 调整代码
  无jira任务 调整代码
  无jira任务 调整代码
  REPORT-1227
  REPORT-934

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

@@ -539,7 +539,8 @@ FR-Designer_PageSetup_Page=Page
 FR-Designer_Custom_Job_Description=Description
 FR-Designer_Property=Property
 FR-Designer_ClassName=Class Name
+FR-Designer_Role=Role
 FR-Designer-Move_Tab_First=move to first
 FR-Designer-Move_Tab_End=move to end
 FR-Designer-Move_Tab_Next=move to next
-FR-Designer-Move_Tab_Prev=move to previous
+FR-Designer-Move_Tab_Prev=move to previous

designer_base/src/com/fr/design/style/color/ColorSelectConfigManager.java

@@ -1,56 +1,192 @@
 package com.fr.design.style.color;
 
+import com.fr.file.XMLFileManager;
+
+
+import com.fr.base.FRContext;
+import com.fr.cluster.rpc.RPC;
+import com.fr.file.BaseClusterHelper;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralContext;
+import com.fr.stable.EnvChangedListener;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLTools;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.general.FRLogger;
+
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
+import java.io.InputStream;
 
 /**
  * 最近使用颜色
- * @author focus
  *
+ * @author focus
  */
-public class ColorSelectConfigManager{
+public class ColorSelectConfigManager extends XMLFileManager implements ColorSelectConfigManagerProvider {
-	
+
-	// 最近使用的颜色个数
+    // 最近使用的颜色个数
-	private int colorNums = 20;
+    private int colorNums = 20;
-	// 最近使用颜色
+
-	private List<Color> colors;
+    private static ColorSelectConfigManagerProvider configManager = null;
-	
+    private static ColorSelectConfigManager colorSelectConfigManager = null;
-	private static ColorSelectConfigManager colorSelectConfigManager = null;
+    private boolean init = true;
-	
+    // 最近使用颜色
-	public  Color[] getColors() {
+    private List<Color> colors = new ArrayList<Color>();
-		if(colors == null){
+    private static final String RECENT_COLOR_TAG = "RecentColors";
-			colors = new ArrayList<Color>();
+    private static final String COLOR_TAG = "Color";
-		}
+
-		return colors.toArray(new Color[colors.size()]);
+    static {
-	}
+        GeneralContext.addEnvChangedListener(new EnvChangedListener() {
-
+            public void envChanged() {
-	public int getColorNum() {
+                ColorSelectConfigManager.envChanged();
-		return colorNums;
+            }
-	}
+        });
-	public void setColorNum(int colorNums) {
+    }
-		this.colorNums = colorNums;
+
-	}
+    private static void envChanged() {
-
+        configManager = null;
-	public synchronized static ColorSelectConfigManager getInstance() {
+    }
-		if (colorSelectConfigManager == null) {
+
-			colorSelectConfigManager = new ColorSelectConfigManager();
+    public Color[] getColors() {
-		}
+
-		return colorSelectConfigManager;
+        //初次打开软件时从xml文件中获取历史颜色信息
-	}
+        if (init) {
-
+            ColorSelectConfigManagerProvider manager = ColorSelectConfigManager.getProviderInstance();
-	/**
+            this.colors = manager.getColorsFromFile();
-	 * 添加颜色到最近使用队列中
+            init = false;
-	 * 
+        }
-	 * @param color 颜色
+        if (colors == null) {
-	 * 
+            colors = new ArrayList<Color>();
-	 */
+        }
-	public void addToColorQueue(Color color){
+        return colors.toArray(new Color[colors.size()]);
-		// 过滤重复的最近使用颜色
+    }
-		// 因为有个后进先出的问题，最近使用的颜色需要放到最前面所以没用set
+
-		if(colors.contains(color)){
+    public int getColorNum() {
-			colors.remove(color);
+        return colorNums;
-		}
+    }
-		colors.add(color);
+
-	} 
+    public void setColorNum(int colorNums) {
-}
+        this.colorNums = colorNums;
+    }
+
+    public synchronized static ColorSelectConfigManager getInstance() {
+        if (colorSelectConfigManager == null) {
+            colorSelectConfigManager = new ColorSelectConfigManager();
+        }
+        return colorSelectConfigManager;
+    }
+
+    /**
+     * 添加颜色到最近使用队列中
+     *
+     * @param color 颜色
+     */
+    public void addToColorQueue(Color color) {
+        // 过滤重复的最近使用颜色
+        // 因为有个后进先出的问题，最近使用的颜色需要放到最前面所以没用set
+        if (colors.contains(color)) {
+            colors.remove(color);
+        }
+        colors.add(color);
+
+        /*@author yaohwu*/
+        //将历史颜色信息保存到xml文件中去
+        ColorSelectConfigManagerProvider manager = ColorSelectConfigManager.getProviderInstance();
+        if (colors != null && !colors.isEmpty()) {
+            manager.setColorsToFile(colors);
+        }
+        try {
+            FRContext.getCurrentEnv().writeResource(manager);
+        } catch (Exception e) {
+            FRLogger.getLogger().error(e.getMessage());
+        }
+    }
+
+
+    /**
+     * 读取配置文件流
+     *
+     * @param input 流
+     * @throws Exception 异常
+     */
+    @Override
+    public void readFromInputStream(InputStream input) throws Exception {
+        ColorSelectConfigManager manager = new ColorSelectConfigManager();
+        XMLTools.readInputStreamXML(manager, input);
+        configManager = manager;
+        FRContext.getCurrentEnv().writeResource(configManager);
+    }
+
+
+    /**
+     * 获取配置管理接口
+     *
+     * @return 配置管理接口ConfigManagerProvider
+     */
+    public synchronized static ColorSelectConfigManagerProvider getProviderInstance() {
+        if (configManager == null) {
+            if (isClusterMember()) {
+                return configManager;
+            }
+            configManager.readXMLFile();
+        }
+        return configManager;
+    }
+
+    private synchronized static boolean isClusterMember() {
+        switch (BaseClusterHelper.getClusterState()) {
+            case LEADER:
+                configManager = new ColorSelectConfigManager();
+                RPC.registerSkeleton(configManager);
+                return false;
+            case MEMBER:
+                String ip = BaseClusterHelper.getMainServiceIP();
+                configManager = (ColorSelectConfigManagerProvider) RPC.getProxy(ColorSelectConfigManager.class, ip);
+                return true;
+            default:
+                configManager = new ColorSelectConfigManager();
+                break;
+        }
+        return false;
+    }
+
+    public boolean writeResource() throws Exception {
+        return FRContext.getCurrentEnv().writeResource(ColorSelectConfigManager.getProviderInstance());
+    }
+
+    public String fileName() {
+        return "recentcolors.xml";
+    }
+
+    public void readXML(XMLableReader reader) {
+        String name = reader.getTagName();
+        if (reader.isChildNode()) {
+            if (ComparatorUtils.equals(COLOR_TAG, name)) {
+                Color color = null;
+                colors.add(reader.getAttrAsColor("colors", color));
+            }
+        }
+    }
+
+    public void writeXML(XMLPrintWriter writer) {
+        writer.startTAG(RECENT_COLOR_TAG);
+        if (this.colors != null && !this.colors.isEmpty()) {
+            for (int i = 0; i < this.colors.size(); i++) {
+                writer.startTAG(COLOR_TAG);
+                writer.attr("colors", colors.get(i).getRGB());
+                writer.end();
+            }
+        }
+        writer.end();
+    }
+
+    public List<Color> getColorsFromFile() {
+        return this.colors;
+    }
+
+    public void setColorsToFile(List<Color> colors) {
+        this.colors = colors;
+    }
+}

designer_base/src/com/fr/design/style/color/ColorSelectConfigManagerProvider.java

@@ -0,0 +1,17 @@
+package com.fr.design.style.color;
+
+import com.fr.stable.file.RemoteXMLFileManagerProvider;
+
+import java.awt.Color;
+import java.util.List;
+
+
+/**
+ * Created by yaohwu on 2017/2/8.
+ */
+public interface ColorSelectConfigManagerProvider extends RemoteXMLFileManagerProvider {
+
+    List<Color> getColorsFromFile();
+
+    void setColorsToFile(List<Color> colors);
+}