Commit 21f92e39 authored by 王业明's avatar 王业明
Browse files

#==BapIDE工程代码转换

1、修改ide_py2-tranto-py3.py中SRCPATH变量定义为对应的BapIDE-workspace路径

2、执行如下命令,转换后的文件夹名称会加后缀-py3,对以前手工在代码中处理的编码转换会进行提示,也需手工去进行修改
python3 ide_py2-tranto-py3.py

3、升级BapIDE版本到BapIDE_1.5.1_20250521及以上

4、修改BapIDE中配置:
(1) TAB键设置为4个空格、编辑器编码设置为UTF-8
        窗口 --> 首选项 --> 常规 --> 编辑器 --> 文本编辑器:
        *: 查看和修改“显示的Tab键宽度(T):”为4,选择“插入空格代替制表符”
        *: --> 拼写 --> 将“编码(C):”修改为“缺省值(UTF-8)”
(2) 内容类型里将Python文件的编码设置为UTF-8
        窗口 --> 首选项 --> 常规 --> 内容类型 --> 在右边“内容类型(C):”里找到“Python
File”,将下方的缺省编码改为“UTF-8”,并点击“更新”
(3) CGC编译器
        窗口 --> 首选项 --> BAP设置 --> 编译器(将编译器类型改为:CGC) -->
CGC编译器(将CGC使用版本改为:V3-PY3)

5、若本机已经安装Python3,可以在BapIDE中配置Python3版本:
	窗口 --> 首选项 --> PyDev --> Interpreter - Python --> 新建(W)... -->
找到Python3执行文件进行导入。
parent d6727218
...@@ -17,6 +17,7 @@ import cn.com.bankit.ide.bap.constants.BapResource; ...@@ -17,6 +17,7 @@ import cn.com.bankit.ide.bap.constants.BapResource;
import cn.com.bankit.ide.bap.constants.IBapConstants; import cn.com.bankit.ide.bap.constants.IBapConstants;
import cn.com.bankit.ide.bap.constants.INavigatorConstants; import cn.com.bankit.ide.bap.constants.INavigatorConstants;
import cn.com.bankit.ide.bap.navigator.model.desc.Directory; import cn.com.bankit.ide.bap.navigator.model.desc.Directory;
import cn.com.bankit.ide.bap.preferences.BapPreActivator;
import cn.com.bankit.ide.bap.util.BapUtil; import cn.com.bankit.ide.bap.util.BapUtil;
import cn.com.bankit.ide.bap.util.file.BapFileUtil; import cn.com.bankit.ide.bap.util.file.BapFileUtil;
import cn.com.bankit.ide.toolkit.common.MessageBoxUtil; import cn.com.bankit.ide.toolkit.common.MessageBoxUtil;
...@@ -109,9 +110,12 @@ public class OpenSrcAction extends WorkflowNodeAction ...@@ -109,9 +110,12 @@ public class OpenSrcAction extends WorkflowNodeAction
BufferedReader br = null; BufferedReader br = null;
try try
{ {
String cgcVer = BapPreActivator.getDefault().getPreferenceStore().getString(IBapConstants.BAP_PREF_CPL_CGC_VER);
String charsetName = IBapConstants.BAP_PREF_CPL_CGC_VER_V1_0_0.equals(cgcVer)
? IBapConstants.ENCODING_GBK : IBapConstants.ENCODING_UTF_8;
br = new BufferedReader(new InputStreamReader( br = new BufferedReader(new InputStreamReader(
new FileInputStream(pyFile), new FileInputStream(pyFile),
IBapConstants.ENCODING_GBK)); charsetName));
String line = ""; String line = "";
StringBuffer sb = null; StringBuffer sb = null;
......
...@@ -23,6 +23,7 @@ Require-Bundle: org.eclipse.ui, ...@@ -23,6 +23,7 @@ Require-Bundle: org.eclipse.ui,
cn.com.bankit.ide.bap.business.workflow;bundle-version="1.0.0", cn.com.bankit.ide.bap.business.workflow;bundle-version="1.0.0",
cn.com.bankit.ide.common.resources;bundle-version="2.0.1", cn.com.bankit.ide.common.resources;bundle-version="2.0.1",
org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0", org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
org.eclipse.jface.text;bundle-version="3.7.2" org.eclipse.jface.text;bundle-version="3.7.2",
cn.com.bankit.ide.bap.preferences
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
...@@ -43,6 +43,7 @@ import cn.com.bankit.common.castor.model.component.Transition; ...@@ -43,6 +43,7 @@ import cn.com.bankit.common.castor.model.component.Transition;
import cn.com.bankit.ide.bap.component.manager.viewer.ComponentContentProvider; import cn.com.bankit.ide.bap.component.manager.viewer.ComponentContentProvider;
import cn.com.bankit.ide.bap.constants.IBapConstants; import cn.com.bankit.ide.bap.constants.IBapConstants;
import cn.com.bankit.ide.bap.constants.IComponentConstants; import cn.com.bankit.ide.bap.constants.IComponentConstants;
import cn.com.bankit.ide.bap.preferences.BapPreActivator;
import cn.com.bankit.ide.bap.python.parser.BeanHelper; import cn.com.bankit.ide.bap.python.parser.BeanHelper;
import cn.com.bankit.ide.bap.python.parser.PythonComponentParser; import cn.com.bankit.ide.bap.python.parser.PythonComponentParser;
import cn.com.bankit.ide.bap.python.parser.PythonParseExcption; import cn.com.bankit.ide.bap.python.parser.PythonParseExcption;
...@@ -137,6 +138,9 @@ public class CheckComponentAction extends Action implements ...@@ -137,6 +138,9 @@ public class CheckComponentAction extends Action implements
PythonComponentParser parser = new PythonComponentParser(); PythonComponentParser parser = new PythonComponentParser();
try try
{ {
String cgcVer = BapPreActivator.getDefault().getPreferenceStore().getString(IBapConstants.BAP_PREF_CPL_CGC_VER);
String charsetName = IBapConstants.BAP_PREF_CPL_CGC_VER_V1_0_0.equals(cgcVer)
? IBapConstants.ENCODING_GBK : IBapConstants.ENCODING_UTF_8;
pyFile = parser.parse(file.getLocation().toFile(), pyFile = parser.parse(file.getLocation().toFile(),
IBapConstants.ENCODING_GBK); IBapConstants.ENCODING_GBK);
ComponentDefinition componentDefinition = BeanHelper.exchange( ComponentDefinition componentDefinition = BeanHelper.exchange(
......
...@@ -48,6 +48,7 @@ import cn.com.bankit.ide.bap.constants.IBapConstants; ...@@ -48,6 +48,7 @@ import cn.com.bankit.ide.bap.constants.IBapConstants;
import cn.com.bankit.ide.bap.constants.IComponentConstants; import cn.com.bankit.ide.bap.constants.IComponentConstants;
import cn.com.bankit.ide.bap.constants.INavigatorConstants; import cn.com.bankit.ide.bap.constants.INavigatorConstants;
import cn.com.bankit.ide.bap.navigator.model.desc.Directory; import cn.com.bankit.ide.bap.navigator.model.desc.Directory;
import cn.com.bankit.ide.bap.preferences.BapPreActivator;
import cn.com.bankit.ide.bap.python.parser.PyParser; import cn.com.bankit.ide.bap.python.parser.PyParser;
import cn.com.bankit.ide.bap.util.file.BapFileUtil; import cn.com.bankit.ide.bap.util.file.BapFileUtil;
import cn.com.bankit.ide.toolkit.common.MessageBoxUtil; import cn.com.bankit.ide.toolkit.common.MessageBoxUtil;
...@@ -288,7 +289,10 @@ public class RegisterFactory ...@@ -288,7 +289,10 @@ public class RegisterFactory
try try
{ {
File xmlCmpFile = new File(xmlPath + "/" + fileName); File xmlCmpFile = new File(xmlPath + "/" + fileName);
int regRes = PyParser.register(pythonFile, IBapConstants.ENCODING_GBK, String cgcVer = BapPreActivator.getDefault().getPreferenceStore().getString(IBapConstants.BAP_PREF_CPL_CGC_VER);
String charsetName = IBapConstants.BAP_PREF_CPL_CGC_VER_V1_0_0.equals(cgcVer)
? IBapConstants.ENCODING_GBK : IBapConstants.ENCODING_UTF_8;
int regRes = PyParser.register(pythonFile, charsetName,
xmlCmpFile, pyLevel); xmlCmpFile, pyLevel);
if(PyParser.PY_REG_OK == regRes) if(PyParser.PY_REG_OK == regRes)
regSucCnt++; regSucCnt++;
......
...@@ -51,6 +51,7 @@ import cn.com.bankit.ide.bap.navigator.BapNavigatorActivator; ...@@ -51,6 +51,7 @@ import cn.com.bankit.ide.bap.navigator.BapNavigatorActivator;
import cn.com.bankit.ide.bap.navigator.model.desc.Directory; import cn.com.bankit.ide.bap.navigator.model.desc.Directory;
import cn.com.bankit.ide.bap.navigator.model.desc.Filelist; import cn.com.bankit.ide.bap.navigator.model.desc.Filelist;
import cn.com.bankit.ide.bap.navigator.model.menu.Node; import cn.com.bankit.ide.bap.navigator.model.menu.Node;
import cn.com.bankit.ide.bap.preferences.BapPreActivator;
import cn.com.bankit.ide.bap.util.file.BapFileUtil; import cn.com.bankit.ide.bap.util.file.BapFileUtil;
import cn.com.bankit.ide.toolkit.common.MessageBoxUtil; import cn.com.bankit.ide.toolkit.common.MessageBoxUtil;
import cn.com.bankit.ide.toolkit.file.FileUtil; import cn.com.bankit.ide.toolkit.file.FileUtil;
...@@ -179,10 +180,14 @@ public abstract class CopyFileDialog extends AbstractCreateDialog ...@@ -179,10 +180,14 @@ public abstract class CopyFileDialog extends AbstractCreateDialog
{ {
FileUtil.createFile(systemFile, getContent(icontainer), FileUtil.createFile(systemFile, getContent(icontainer),
IBapConstants.ENCODING_UTF_8); IBapConstants.ENCODING_UTF_8);
} else } else {
String cgcVer = BapPreActivator.getDefault().getPreferenceStore().getString(IBapConstants.BAP_PREF_CPL_CGC_VER);
String charsetName = IBapConstants.BAP_PREF_CPL_CGC_VER_V1_0_0.equals(cgcVer)
? IBapConstants.ENCODING_GBK : IBapConstants.ENCODING_UTF_8;
FileUtil.createFile(systemFile, FileUtil.createFile(systemFile,
getContent(icontainer), getContent(icontainer),
IBapConstants.ENCODING_GBK); charsetName);
}
} else } else
{ {
FileUtil.createFile(systemFile, getContent(icontainer), FileUtil.createFile(systemFile, getContent(icontainer),
......
...@@ -51,6 +51,7 @@ import cn.com.bankit.ide.bap.navigator.handler.HandlerFactory; ...@@ -51,6 +51,7 @@ import cn.com.bankit.ide.bap.navigator.handler.HandlerFactory;
import cn.com.bankit.ide.bap.navigator.handler.IHandler; import cn.com.bankit.ide.bap.navigator.handler.IHandler;
import cn.com.bankit.ide.bap.navigator.model.desc.Directory; import cn.com.bankit.ide.bap.navigator.model.desc.Directory;
import cn.com.bankit.ide.bap.navigator.model.menu.Node; import cn.com.bankit.ide.bap.navigator.model.menu.Node;
import cn.com.bankit.ide.bap.preferences.BapPreActivator;
import cn.com.bankit.ide.bap.util.file.BapFileUtil; import cn.com.bankit.ide.bap.util.file.BapFileUtil;
import cn.com.bankit.ide.toolkit.common.MessageBoxUtil; import cn.com.bankit.ide.toolkit.common.MessageBoxUtil;
import cn.com.bankit.ide.toolkit.file.FileUtil; import cn.com.bankit.ide.toolkit.file.FileUtil;
...@@ -172,8 +173,11 @@ public class CreateFileDialog extends AbstractCreateDialog ...@@ -172,8 +173,11 @@ public class CreateFileDialog extends AbstractCreateDialog
|| INavigatorConstants.NV_NODE_APPTST.equals(pd || INavigatorConstants.NV_NODE_APPTST.equals(pd
.getType())) .getType()))
{ {
String cgcVer = BapPreActivator.getDefault().getPreferenceStore().getString(IBapConstants.BAP_PREF_CPL_CGC_VER);
String charsetName = IBapConstants.BAP_PREF_CPL_CGC_VER_V1_0_0.equals(cgcVer)
? IBapConstants.ENCODING_GBK : IBapConstants.ENCODING_UTF_8;
FileUtil.createFile(systemFile, content, FileUtil.createFile(systemFile, content,
IBapConstants.ENCODING_GBK); charsetName);
} else } else
{ {
FileUtil.createFile(systemFile, content, FileUtil.createFile(systemFile, content,
......
...@@ -68,8 +68,12 @@ public class CreateObjectFolderHandler extends AbstractFolderHandler ...@@ -68,8 +68,12 @@ public class CreateObjectFolderHandler extends AbstractFolderHandler
FileUtil.createFile(oxfile, "", IBapConstants.ENCODING_UTF_8); FileUtil.createFile(oxfile, "", IBapConstants.ENCODING_UTF_8);
File pyfile = new File(filePath.replace(IWorkflowConstants.WF_FILE_SUFFIX, "py")); File pyfile = new File(filePath.replace(IWorkflowConstants.WF_FILE_SUFFIX, "py"));
if (!pyfile.exists()) if (!pyfile.exists()) {
FileUtil.createFile(pyfile, "", IBapConstants.ENCODING_GBK); String cgcVer = BapPreActivator.getDefault().getPreferenceStore().getString(IBapConstants.BAP_PREF_CPL_CGC_VER);
String charsetName = IBapConstants.BAP_PREF_CPL_CGC_VER_V1_0_0.equals(cgcVer)
? IBapConstants.ENCODING_GBK : IBapConstants.ENCODING_UTF_8;
FileUtil.createFile(pyfile, "", charsetName);
}
} }
} }
} }
...@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui, ...@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.ui,
cn.com.bankit.ide.bap.util;bundle-version="1.0.0", cn.com.bankit.ide.bap.util;bundle-version="1.0.0",
cn.com.bankit.ide.bap.navigator.model;bundle-version="1.0.0", cn.com.bankit.ide.bap.navigator.model;bundle-version="1.0.0",
cn.com.bankit.common.castor.model;bundle-version="1.0.0", cn.com.bankit.common.castor.model;bundle-version="1.0.0",
cn.com.bankit.ide.toolkit;bundle-version="1.0.0" cn.com.bankit.ide.toolkit;bundle-version="1.0.0",
cn.com.bankit.ide.bap.preferences
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: BankIt Bundle-Vendor: BankIt
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</property> </property>
<property <property
name="aboutText" name="aboutText"
value="业务处理平台基础开发环境(BAP IDE)&#x0A;&#x0A;授权版本: V1.5.0&#x0A;发布日期: 20140510&#x0A;&#x0A;宇信班克版权所有 ©2011-2014"> value="业务处理平台基础开发环境(BAP IDE)&#x0A;&#x0A;授权版本: V1.5.1&#x0A;发布日期: 20250521&#x0A;&#x0A;北京宇信科技集团股份有限公司">
</property> </property>
<property <property
name="startupForegroundColor" name="startupForegroundColor"
......
...@@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.Display; ...@@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.Display;
import cn.com.bankit.ide.bap.constants.BapResource; import cn.com.bankit.ide.bap.constants.BapResource;
import cn.com.bankit.ide.bap.constants.IBapConstants; import cn.com.bankit.ide.bap.constants.IBapConstants;
import cn.com.bankit.ide.bap.constants.IComponentConstants; import cn.com.bankit.ide.bap.constants.IComponentConstants;
import cn.com.bankit.ide.bap.preferences.BapPreActivator;
import cn.com.bankit.ide.bap.product.ui.TransCMPDialog; import cn.com.bankit.ide.bap.product.ui.TransCMPDialog;
import cn.com.bankit.ide.bap.util.BapUtil; import cn.com.bankit.ide.bap.util.BapUtil;
import cn.com.bankit.ide.toolkit.common.MessageBoxUtil; import cn.com.bankit.ide.toolkit.common.MessageBoxUtil;
...@@ -143,9 +144,12 @@ public class TransCmpHandler implements IHandler ...@@ -143,9 +144,12 @@ public class TransCmpHandler implements IHandler
{ {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
String cgcVer = BapPreActivator.getDefault().getPreferenceStore().getString(IBapConstants.BAP_PREF_CPL_CGC_VER);
String charsetName = IBapConstants.BAP_PREF_CPL_CGC_VER_V1_0_0.equals(cgcVer)
? IBapConstants.ENCODING_GBK : IBapConstants.ENCODING_UTF_8;
reader = new BufferedReader(new InputStreamReader( reader = new BufferedReader(new InputStreamReader(
new FileInputStream(file), new FileInputStream(file),
IBapConstants.ENCODING_GBK)); charsetName));
String line = null; String line = null;
while ((line = reader.readLine()) != null) while ((line = reader.readLine()) != null)
{ {
......
...@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", ...@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
cn.com.bankit.ide.bap.python.parser;bundle-version="1.0.0", cn.com.bankit.ide.bap.python.parser;bundle-version="1.0.0",
cn.com.bankit.ide.bap.util;bundle-version="1.0.0", cn.com.bankit.ide.bap.util;bundle-version="1.0.0",
cn.com.bankit.ide.bap.configure;bundle-version="1.0.0", cn.com.bankit.ide.bap.configure;bundle-version="1.0.0",
cn.com.bankit.ide.toolkit;bundle-version="1.0.0" cn.com.bankit.ide.toolkit;bundle-version="1.0.0",
cn.com.bankit.ide.bap.preferences
Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Export-Package: cn.com.bankit.ide.bap.trans, Export-Package: cn.com.bankit.ide.bap.trans,
......
...@@ -65,6 +65,7 @@ import cn.com.bankit.ide.bap.constants.IBapConstants; ...@@ -65,6 +65,7 @@ import cn.com.bankit.ide.bap.constants.IBapConstants;
import cn.com.bankit.ide.bap.constants.IComponentConstants; import cn.com.bankit.ide.bap.constants.IComponentConstants;
import cn.com.bankit.ide.bap.constants.INavigatorConstants; import cn.com.bankit.ide.bap.constants.INavigatorConstants;
import cn.com.bankit.ide.bap.constants.IWorkflowConstants; import cn.com.bankit.ide.bap.constants.IWorkflowConstants;
import cn.com.bankit.ide.bap.preferences.BapPreActivator;
import cn.com.bankit.ide.bap.python.parser.PyParser; import cn.com.bankit.ide.bap.python.parser.PyParser;
import cn.com.bankit.ide.bap.trans.bamc.model.bizcmp.Package; import cn.com.bankit.ide.bap.trans.bamc.model.bizcmp.Package;
import cn.com.bankit.ide.bap.trans.bamc.model.proj.App; import cn.com.bankit.ide.bap.trans.bamc.model.proj.App;
...@@ -525,7 +526,10 @@ public class V1ToV2Converter ...@@ -525,7 +526,10 @@ public class V1ToV2Converter
try try
{ {
File xmlCmpFile = new File(file, fileName); File xmlCmpFile = new File(file, fileName);
PyParser.register(pythonFile, IBapConstants.ENCODING_GBK, xmlCmpFile, pyLevel); String cgcVer = BapPreActivator.getDefault().getPreferenceStore().getString(IBapConstants.BAP_PREF_CPL_CGC_VER);
String charsetName = IBapConstants.BAP_PREF_CPL_CGC_VER_V1_0_0.equals(cgcVer)
? IBapConstants.ENCODING_GBK : IBapConstants.ENCODING_UTF_8;
PyParser.register(pythonFile, charsetName, xmlCmpFile, pyLevel);
} }
catch (Exception e) catch (Exception e)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment