Browse Source

Merge pull request #117 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0

* commit '503c7335efaaa605bdb1e8a5b1d113f89408f309':
  无JIRA任务 修复用了可变参数无法序列化问题
master
superman 7 years ago
parent
commit
d0dbe4ba60
  1. 2
      designer-base/src/com/fr/design/formula/JavaEditorPane.java
  2. 6
      designer-base/src/com/fr/env/RemoteEnv.java

2
designer-base/src/com/fr/design/formula/JavaEditorPane.java

@ -156,7 +156,7 @@ public class JavaEditorPane extends BasicPane {
return;
}
try {
FRContext.getCurrentEnv().getFileOperator().write(text.getBytes(EncodeConstants.ENCODING_UTF_8), ProjectConstants.CLASSES_NAME, getJavaPath());
FRContext.getCurrentEnv().getFileOperator().write(text.getBytes(EncodeConstants.ENCODING_UTF_8), StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()));
JOptionPane.showMessageDialog(null, Inter.getLocText(new String[]{"Save", "Successfully"}) + "!");
fireSaveActionListener();
} catch (Exception e) {

6
designer-base/src/com/fr/env/RemoteEnv.java vendored

@ -5,6 +5,7 @@ import com.fr.base.TableData;
import com.fr.base.operator.common.CommonOperator;
import com.fr.base.operator.connect.ConnectOperator;
import com.fr.base.operator.file.FileOperator;
import com.fr.base.operator.file.SimpleFileOperator;
import com.fr.base.operator.org.OrganizationOperator;
import com.fr.base.remote.RemoteDeziConstants;
import com.fr.common.rpc.RemoteCallServerConfig;
@ -126,6 +127,11 @@ public class RemoteEnv extends AbstractEnv<RemoteEnvConfig> implements DesignAut
return MessageSendExecutor.getInstance().execute(OrganizationOperator.class);
}
@Override
public SimpleFileOperator getSimpleFileOperator() throws Exception {
return MessageSendExecutor.getInstance().execute(SimpleFileOperator.class);
}
@Override
public RemoteEnvConfig getEnvConfig() {
return config;

Loading…
Cancel
Save