Browse Source

Merge pull request #1453 in DESIGN/design from release/10.0 to feature/10.0

* commit 'ca4cc282763d1a6b4d604dbb1a6213f739e6de26':
  无任务,编译失败
  REPORT-27280 程序数据集支持刷新出所需参数 支持在选中 class 后,刷新出参数
  无jira任务,import需要依赖third
  REPORT-27189 切换到单机环境,鼠标悬停在版本管理上,提示错误
research/11.0
ju.ju 5 years ago
parent
commit
a3c2d73bfd
  1. 6
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
  3. 6
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java

6
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java

@ -57,8 +57,10 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
(Dialog) SwingUtilities.getWindowAncestor(ClassTableDataPane.this),
new DialogActionAdapter() {
public void doOk() {
classNameTextField.setText(bPane.getClassPath());
}
String classPath = bPane.getClassPath();
ClassTableData tableData = new ClassTableData(classPath);
populateBean(tableData);
}
});
dlg.setVisible(true);
}

2
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@ -218,7 +218,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
if (VcsHelper.getInstance().needInit()) {
vcsAction = new VcsAction();
if (WorkContext.getCurrent().isLocal()) {
if (!WorkContext.getCurrent().isCluster()) {
vcsAction.setName(Toolkit.i18nText("Fine-Design_Vcs_Title"));
} else {
vcsAction.setName(Toolkit.i18nText("Fine-Design_Vcs_NotSupportRemote"));

6
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/RobotModel.java

@ -9,7 +9,7 @@ import com.fr.log.FineLoggerFactory;
import com.fr.stable.AssistUtils;
import com.fr.stable.EncodeConstants;
import com.fr.stable.StringUtils;
import org.apache.commons.codec.digest.DigestUtils;
import com.fr.third.org.apache.commons.codec.digest.DigestUtils;
import java.awt.Desktop;
import java.io.IOException;
@ -50,7 +50,7 @@ public class RobotModel extends AlphaCellModel {
try {
String result = HttpToolbox.get(url);
if(StringUtils.isEmpty(result)){
if (StringUtils.isEmpty(result)) {
return StringUtils.EMPTY;
}
JSONObject jsonObject = new JSONObject(result);
@ -94,7 +94,7 @@ public class RobotModel extends AlphaCellModel {
@Override
public final boolean equals(Object obj) {
return obj instanceof RobotModel
&& AssistUtils.equals(this.title, ((RobotModel)obj).title)
&& AssistUtils.equals(this.title, ((RobotModel) obj).title)
&& AssistUtils.equals(this.content, ((RobotModel) obj).content);
}

Loading…
Cancel
Save