Merge branch 'release' of http://www.finedevelop.com:2015/scm/~eason/design_release into release

designer_base/src/com/fr/design/actions/file/SwitchExistEnv.java

@@ -3,11 +3,13 @@ package com.fr.design.actions.file;
 import com.fr.base.BaseUtils;
 import com.fr.base.Env;
 import com.fr.base.FRContext;
-import com.fr.design.data.DesignTableDataManager;
+import com.fr.base.FRCoreContext;
-import com.fr.design.data.tabledata.ResponseDataSourceChange;
 import com.fr.dav.LocalEnv;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.data.tabledata.ResponseDataSourceChange;
+import com.fr.design.dialog.InformationWarnPane;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
@@ -15,22 +17,18 @@ import com.fr.design.mainframe.TemplatePane;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
-import com.fr.design.dialog.InformationWarnPane;
 import com.fr.env.RemoteEnv;
 import com.fr.env.SignIn;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
-import com.fr.stable.LicUtils;
-import com.fr.stable.ProductConstants;
 import com.fr.stable.EnvChangedListener;
+import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
-import com.fr.stable.help.FineClassLoader;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
-import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -131,14 +129,7 @@ public class SwitchExistEnv extends MenuDef {
         }
 
         private void resetLicenseBytes() {
-            FineClassLoader classLoader = new FineClassLoader();
+            FRCoreContext.retryLicLock();
-            try {
-                Class<?> clazz = classLoader.loadClass("com.fr.base.FRCoreContext");
-                Method retryMethod = clazz.getMethod("retryLicLock");
-                retryMethod.invoke(clazz);
-            } catch (Exception ignore) {
-
-            }
         }
     }
 

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

@@ -1,6 +1,14 @@
 package com.fr.env;
 
-import com.fr.base.*;
+import com.fr.base.AbstractEnv;
+import com.fr.base.EnvException;
+import com.fr.base.FRContext;
+import com.fr.base.FRCoreContext;
+import com.fr.base.ModifiedTable;
+import com.fr.base.Parameter;
+import com.fr.base.StoreProcedureParameter;
+import com.fr.base.TableData;
+import com.fr.base.Utils;
 import com.fr.base.remote.RemoteDeziConstants;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.TableProcedure;
@@ -22,7 +30,12 @@ import com.fr.file.CacheManager;
 import com.fr.file.DatasourceManager;
 import com.fr.file.DatasourceManagerProvider;
 import com.fr.file.filetree.FileNode;
-import com.fr.general.*;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.FRLogger;
+import com.fr.general.IOUtils;
+import com.fr.general.Inter;
+import com.fr.general.LogRecordTime;
+import com.fr.general.VT4FR;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONException;
@@ -32,9 +45,15 @@ import com.fr.plugin.PluginLicense;
 import com.fr.plugin.PluginLicenseManager;
 import com.fr.plugin.PluginLoader;
 import com.fr.share.ShareConstants;
-import com.fr.stable.*;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.EncodeConstants;
+import com.fr.stable.JavaCompileInfo;
+import com.fr.stable.LicUtils;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.SvgProvider;
 import com.fr.stable.file.XMLFileManagerProvider;
-import com.fr.stable.help.FineClassLoader;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLTools;
@@ -42,18 +61,37 @@ import com.fr.stable.xml.XMLableReader;
 import com.fr.web.ResourceConstants;
 
 import javax.swing.*;
-import javax.xml.transform.*;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import java.awt.*;
-import java.io.*;
+import java.io.BufferedReader;
-import java.lang.reflect.Method;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.NoRouteToHostException;
 import java.net.Socket;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Timer;
+import java.util.TimerTask;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
@@ -1397,14 +1435,7 @@ public class RemoteEnv extends AbstractEnv {
         }
 
         private void resetLicenseBytes() {
-            FineClassLoader classLoader = new FineClassLoader();
+            FRCoreContext.retryLicLock();
-            try {
-                Class<?> clazz = classLoader.loadClass("com.fr.base.FRCoreContext");
-                Method retryMethod = clazz.getMethod("retryLicLock");
-                retryMethod.invoke(clazz);
-            } catch (Exception ignore) {
-
-            }
         }
 
         /**

designer_chart/src/com/fr/design/chart/ChartTypePane.java

@@ -5,8 +5,13 @@ package com.fr.design.chart;
  */
 
 import com.fr.base.FRContext;
+import com.fr.base.FRCoreContext;
 import com.fr.chart.base.ChartInternationalNameContentBean;
-import com.fr.chart.chartattr.*;
+import com.fr.chart.chartattr.Chart;
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartattr.ChartIcon;
+import com.fr.chart.chartattr.MapPlot;
+import com.fr.chart.chartattr.Plot;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -14,14 +19,11 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
 import com.fr.general.RegistEditionException;
 import com.fr.general.VT4FR;
-import com.fr.stable.StableUtils;
-import com.fr.stable.help.FineClassLoader;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import java.awt.*;
-import java.lang.reflect.Method;
 
 public class ChartTypePane extends ChartCommonWizardPane {
     private static final long serialVersionUID = -1175602484968520546L;
@@ -168,15 +170,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
     }
 
     private boolean supportMap() {
-        FineClassLoader classLoader = new FineClassLoader();
+        byte[] bytes = FRCoreContext.getBytes();
-        byte[] bytes = null;
-        try {
-            Class<?> clazz = classLoader.loadClass("com.fr.base.FRCoreContext");
-            Method method = clazz.getMethod("getBytes");
-            bytes = (byte[]) method.invoke(clazz);
-        } catch (Exception ignore) {
-
-        }
         return VT4FR.isLicAvailable(bytes) && VT4FR.CHART_MAP.support();
     }