Browse Source

Merge pull request #876 in BA/design from ~XIAOXIA/design:9.0 to 9.0

* commit 'd19a408c077812afa707357d2e283b9c1d2fa25b':
  rt
  rt
master
superman 8 years ago
parent
commit
20033e0a63
  1. 2
      designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java
  2. 2
      designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

2
designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java

@ -22,7 +22,7 @@ public class AlphaFineHelper {
} }
public static String findFolderName (String text) { public static String findFolderName (String text) {
String[] textArray = text.split("/"); String[] textArray = text.split(File.separator);
if (textArray != null && textArray.length > 1) { if (textArray != null && textArray.length > 1) {
return textArray[textArray.length - 2]; return textArray[textArray.length - 2];

2
designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@ -314,7 +314,7 @@ public class AlphaFineDialog extends UIDialog {
@Override @Override
protected BufferedImage doInBackground() throws Exception { protected BufferedImage doInBackground() throws Exception {
WorkBook workBook = (WorkBook) TemplateWorkBookIO.readTemplateWorkBook(FRContext.getCurrentEnv(), fileName); WorkBook workBook = (WorkBook) TemplateWorkBookIO.readTemplateWorkBook(FRContext.getCurrentEnv(), fileName);
BufferedImage bufferedImage = new ImageExporter().export(workBook); BufferedImage bufferedImage = new ImageExporter().exportToImage(workBook);
return bufferedImage; return bufferedImage;
} }

Loading…
Cancel
Save