Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev

designer_base/src/com/fr/design/gui/style/AlignmentPane.java

@@ -81,7 +81,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 				BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")};
 		Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL};
 		hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
-		hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("StyleAlignment-Tooltips_Right"),
+		hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"),
 		Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Distributed"),Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_DEFAULT")});
 		hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
 		vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));

designer_base/src/com/fr/env/RemoteEnv.java

@@ -2046,24 +2046,6 @@ public class RemoteEnv implements Env {
 
     }
 
-    private void readPlugins() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        HashMap<String, String> para = new HashMap<String, String>();
-        para.put("op", "fr_remote_design");
-        para.put("cmd", "design_plugins");
-
-        InputStream inputStream = postBytes2ServerB(out.toByteArray(), para);
-        String pluginsStr = IOUtils.inputStream2String(inputStream, EncodeConstants.ENCODING_UTF_8);
-        if (StringUtils.isNotBlank(pluginsStr) && pluginsStr.startsWith("[")) {
-            JSONArray jsonArray = new JSONArray(pluginsStr);
-            for (int i = 0; i < jsonArray.length(); i++) {
-                Plugin plugin = new Plugin();
-                plugin.parseJSON(jsonArray.getJSONObject(i));
-                PluginLoader.getLoader().addRemotePlugin(plugin);
-            }
-        }
-    }
-
     private void readPluginLicenses() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         HashMap<String, String> para = new HashMap<String, String>();
@@ -2084,7 +2066,7 @@ public class RemoteEnv implements Env {
 
     @Override
     public void readPluginConfig() throws Exception {
-        readPlugins();
+        PluginLoader.getLoader().readFromRemoteEnv();
         readPluginLicenses();
     }
 }