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

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.design.data.tabledata.ResponseDataSourceChange;
+import com.fr.base.FRCoreContext;
 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,16 +17,14 @@ 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 javax.swing.*;
@@ -118,7 +118,7 @@ public class SwitchExistEnv extends MenuDef {
                     return;
                 }
                 SignIn.signIn(selectedEnv);
-                LicUtils.resetBytes();
+                FRCoreContext.resetBytes();
                 HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
                 fireDSChanged();
             } catch (Exception em) {

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

@@ -1381,7 +1381,7 @@ public class RemoteEnv extends AbstractEnv {
                     return;
                 }
                 SignIn.signIn(remoteEnv);
-                LicUtils.resetBytes();
+                FRCoreContext.resetBytes();
                 HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
             } catch (Exception em) {
                 FRContext.getLogger().error(em.getMessage(), em);

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

@@ -5,6 +5,7 @@ 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.charttypes.ChartTypeManager;
@@ -14,7 +15,6 @@ 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 javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
@@ -150,7 +150,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
         String plotID = typeName[mainTypeList.getSelectedIndex()].getPlotID();
         Chart chart = ChartTypeManager.getInstance().getChartTypes(plotID)[iconViewList.getSelectedIndex()];
         if(chart.getPlot() != null){
-            if(chart.getPlot() instanceof MapPlot && !(VT4FR.isLicAvailable(StableUtils.getBytes()) && VT4FR.CHART_MAP.support())){
+            if(chart.getPlot() instanceof MapPlot && !(VT4FR.isLicAvailable(FRCoreContext.getBytes()) && VT4FR.CHART_MAP.support())){
                 JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Chart-Map_Not_Supported"));
                 throw new RegistEditionException(VT4FR.CHART_MAP);
             }