diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
index 1f39f024d2..b57ad6c7af 100644
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
@@ -23,6 +23,7 @@ import com.fr.design.mainframe.ComponentReuseNotifyUtil;
import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
import com.fr.design.mainframe.vcs.VcsConfigManager;
import com.fr.design.notification.SnapChatConfig;
+import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.port.DesignerPortContext;
import com.fr.design.style.color.ColorSelectConfigManager;
import com.fr.design.update.push.DesignerPushUpdateConfigManager;
@@ -211,6 +212,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
private int layoutTemplateStyle = LAYOUT_TEMPLATE_SIMPLE_STYLE;
+ private boolean useOptimizedUPM4Adapter;
+
/**
* DesignerEnvManager.
*/
@@ -665,6 +668,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
this.showTemplateMissingPlugin = showTemplateMissingPlugin;
}
+ public boolean isUseOptimizedUPM4Adapter() {
+ return useOptimizedUPM4Adapter;
+ }
+
+ public void setUseOptimizedUPM4Adapter(boolean useOptimizedUPM4Adapter) {
+ this.useOptimizedUPM4Adapter = useOptimizedUPM4Adapter;
+ }
+
/**
* 知否自动备份
*
@@ -1888,6 +1899,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
this.setEmbedServerLazyStartup(reader.getAttrAsBoolean("embedServerLazyStartup", false));
this.setShowTemplateMissingPlugin(reader.getAttrAsBoolean("showTemplateMissingPlugin", true));
+ this.setUseOptimizedUPM4Adapter(reader.getAttrAsBoolean("useOptimizedUPM4Adapter", SupportOSImpl.MACOS_12_VERSION_ADAPTER.support()));
this.setShowServerDatasetAuthTip(reader.getAttrAsBoolean("showServerDatasetAuthTip", true));
this.setLayoutTemplateStyle(reader.getAttrAsInt("layoutTemplateStyle", LAYOUT_TEMPLATE_SIMPLE_STYLE));
}
@@ -2165,6 +2177,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
}
writer.attr("layoutTemplateStyle", this.getLayoutTemplateStyle());
writer.attr("showServerDatasetAuthTip", this.isShowServerDatasetAuthTip());
+ writer.attr("useOptimizedUPM4Adapter", this.isUseOptimizedUPM4Adapter());
writer.end();
}
diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
index c0797e9462..80f217a31a 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
@@ -16,9 +16,10 @@ import com.fr.design.gui.ibutton.UINoThemeColorButton;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIDictionaryComboBox;
+import com.fr.design.gui.ifilechooser.FileChooserArgs;
+import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ifilechooser.FileSelectionMode;
-import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
import com.fr.design.gui.ilable.ActionLabel;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.iprogressbar.UIProgressBarUI;
@@ -513,9 +514,8 @@ public class PreferencePane extends BasicPane {
@Override
public void actionPerformed(ActionEvent evt) {
FileChooserProvider fileChooserProvider =
- new JavaFxNativeFileChooser.Builder().
- fileSelectionMode(FileSelectionMode.DIR).
- build();
+ FileChooserFactory.createFileChooser(FileChooserArgs.newBuilder().
+ setFileSelectionMode(FileSelectionMode.DIR).build());
int saveValue = fileChooserProvider.showDialog(chooseDirBtn);
if (saveValue == JFileChooser.APPROVE_OPTION) {
File selectedFile = fileChooserProvider.getSelectedFile();
@@ -728,7 +728,8 @@ public class PreferencePane extends BasicPane {
this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort()));
if (useOptimizedUPMCheckbox != null) {
- useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
+ useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM()
+ || DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter());
}
if (useNewVersionLoginCheckbox != null) {
@@ -808,6 +809,7 @@ public class PreferencePane extends BasicPane {
designerEnvManager.setJoinProductImprove(this.joinProductImproveCheckBox.isSelected());
designerEnvManager.setEmbedServerLazyStartup(this.embedServerLazyStartupCheckBox.isSelected());
designerEnvManager.setImageCompress(this.imageCompressPanelCheckBox.isSelected());
+ designerEnvManager.setUseOptimizedUPM4Adapter(this.useOptimizedUPMCheckbox.isSelected());
VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
vcsConfigManager.setSaveInterval(this.saveIntervalEditor.getValue());
vcsConfigManager.setVcsEnable(this.vcsEnableCheckBox.isSelected());
diff --git a/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java b/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java
index 899c04cb17..b4b382af5b 100644
--- a/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java
+++ b/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java
@@ -7,6 +7,7 @@ import com.fr.base.ScreenResolution;
import com.fr.base.Style;
import com.fr.general.FRFont;
import com.fr.general.IOUtils;
+import com.fr.stable.Constants;
import com.fr.stable.unit.PT;
import javax.swing.JPanel;
@@ -153,16 +154,16 @@ public class CellStylePreviewPane extends JPanel {
float adjustRight = 0;
float adjustBottom = 0;
if (column == 0) {
- adjustLeft = GraphHelper.getLineStyleSize(style.getBorderLeft()) / 2.0F;
+ adjustLeft = GraphHelper.getLineStyleSize(style.getBorderLeft()) / 2.0F + computeOffset4DoubleStyleBorder(style);
}
if (row == 0) {
- adjustTop = GraphHelper.getLineStyleSize(style.getBorderTop()) / 2.0F;
+ adjustTop = GraphHelper.getLineStyleSize(style.getBorderTop()) / 2.0F + computeOffset4DoubleStyleBorder(style);
}
if (column == columnSpan - 1) {
- adjustRight = -GraphHelper.getLineStyleSize(style.getBorderRight()) / 2.0F;
+ adjustRight = -GraphHelper.getLineStyleSize(style.getBorderRight()) / 2.0F - computeOffset4DoubleStyleBorder(style);
}
if (row == rowSpan - 1) {
- adjustBottom = -GraphHelper.getLineStyleSize(style.getBorderBottom()) / 2.0F;
+ adjustBottom = -GraphHelper.getLineStyleSize(style.getBorderBottom()) / 2.0F - computeOffset4DoubleStyleBorder(style);
}
g2d.translate(adjustLeft, adjustTop);
@@ -170,6 +171,17 @@ public class CellStylePreviewPane extends JPanel {
g2d.translate(-adjustLeft, -adjustTop);
}
+ private float computeOffset4DoubleStyleBorder(Style style) {
+ float offset = 0F;
+ if (style.getBorderLeft() == Constants.LINE_DOUBLE) {
+ offset += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F;
+ } else if (style.getBorderLeft() == Constants.LINE_DOUBLE_DOT) {
+ offset += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F;
+ }
+
+ return offset;
+ }
+
@Override
public Dimension getPreferredSize() {
Dimension size = super.getPreferredSize();
diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
index 74bf3fe76f..904cdf00b0 100644
--- a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
+++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
@@ -867,8 +867,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
if (checkResult.isValid()) {
showMessageDialog(checkResult.getTips(), checkResult.isValid());
} else {
- String position = Toolkit.i18nText("Fine-Design_Basic_Formula_The") + (checkResult.getFormulaCoordinates().getColumns())
- + Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position") + " ";
+ int columns = checkResult.getFormulaCoordinates().getColumns();
+ String position = StringUtils.EMPTY;
+ if (columns >= 0) {
+ position = Toolkit.i18nText("Fine-Design_Basic_Formula_The") + columns
+ + Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position") + " ";
+ }
int confirmDialog = FineJOptionPane.showConfirmDialog(
FormulaPane.this,
position + messageTips,
@@ -879,7 +883,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
new String[]{Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"), Toolkit.i18nText("Fine-Design_Basic_Formula_Continue")},
Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"));
if (confirmDialog == 0) {
- formulaTextArea.setCaretPosition(checkResult.getFormulaCoordinates().getColumns());
+ formulaTextArea.setCaretPosition(Math.max(columns, 0));
formulaTextArea.requestFocus();
return false;
}
diff --git a/designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckWrongFunction.java b/designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckWrongFunction.java
index 5328ca56ef..417e9b37a6 100644
--- a/designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckWrongFunction.java
+++ b/designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckWrongFunction.java
@@ -74,7 +74,7 @@ public class FormulaCheckWrongFunction implements FunctionD:\finereport\develop\code\test\TestCase\WEB-INF\reportlets\TestCase\01903.cpt
+ *
+ * Extensions are of the type ".foo", which is typically found on
+ * Windows and Unix boxes, but not on Macinthosh. Case is ignored.
+ *
+ * Example - create a new filter that filerts out all files
+ * but gif and jpg image files:
+ *
+ * JFileChooser chooser = new JFileChooser();
+ * ExampleFileFilter filter = new ExampleFileFilter(
+ * new String{"gif", "jpg"}, "JPEG & GIF Images")
+ * chooser.addChoosableFileFilter(filter);
+ * chooser.showOpenDialog(this);
+ *
+ * @author Jeff Dinkins
+ * @version 1.12 12/03/01
+ */
+ class ExampleFileFilter extends FileFilter {
+ private Hashtable filters = null;
+ private String description = null;
+ private String fullDescription = null;
+ private boolean useExtensionsInDescription = true;
+
+ /**
+ * Creates a file filter. If no filters are added, then all
+ * files are accepted.
+ *
+ * @see #addExtension
+ */
+ public ExampleFileFilter() {
+ this.filters = new Hashtable();
+ }
+
+ /**
+ * Creates a file filter that accepts files with the given extension.
+ * Example: new ExampleFileFilter("jpg");
+ *
+ * @see #addExtension
+ */
+ public ExampleFileFilter(String extension) {
+ this(extension, null);
+ }
+
+ /**
+ * Creates a file filter that accepts the given file type.
+ * Example: new ExampleFileFilter("jpg", "JPEG Image Images");
+ *
+ * Note that the "." before the extension is not needed. If
+ * provided, it will be ignored.
+ *
+ * @see #addExtension
+ */
+ public ExampleFileFilter(String extension, String description) {
+ this();
+ if (extension != null) addExtension(extension);
+ if (description != null) setDescription(description);
+ }
+
+ /**
+ * Creates a file filter from the given string array.
+ * Example: new ExampleFileFilter(String {"gif", "jpg"});
+ *
+ * Note that the "." before the extension is not needed adn
+ * will be ignored.
+ *
+ * @see #addExtension
+ */
+ public ExampleFileFilter(String[] filters) {
+ this(filters, null);
+ }
+
+ /**
+ * Creates a file filter from the given string array and description.
+ * Example: new ExampleFileFilter(String {"gif", "jpg"}, "Gif and JPG Images");
+ *
+ * Note that the "." before the extension is not needed and will be ignored.
+ *
+ * @see #addExtension
+ */
+ public ExampleFileFilter(String[] filters, String description) {
+ this();
+ for (int i = 0; i < filters.length; i++) {
+ // add filters one by one
+ addExtension(filters[i]);
+ }
+ if (description != null) setDescription(description);
+ }
+
+ /**
+ * Return true if this file should be shown in the directory pane,
+ * false if it shouldn't.
+ *
+ * Files that begin with "." are ignored.
+ *
+ * @see #getExtension
+ */
+ @Override
+ public boolean accept(File f) {
+ if (f != null) {
+ if (f.isDirectory()) {
+ return true;
+ }
+ String extension = getExtension(f);
+ if (extension != null && filters.get(getExtension(f)) != null) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Return the extension portion of the file's name .
+ *
+ * @see #getExtension
+ * @see FileFilter#accept
+ */
+ public String getExtension(File f) {
+ if (f != null) {
+ String filename = f.getName();
+ int i = filename.lastIndexOf('.');
+ if (i > 0 && i < filename.length() - 1) {
+ return filename.substring(i + 1).toLowerCase();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Adds a filetype "dot" extension to filter against.
+ *
+ * For example: the following code will create a filter that filters
+ * out all files except those that end in ".jpg" and ".tif":
+ *
+ * ExampleFileFilter filter = new ExampleFileFilter();
+ * filter.addExtension("jpg");
+ * filter.addExtension("tif");
+ *
+ * Note that the "." before the extension is not needed and will be ignored.
+ */
+ public void addExtension(String extension) {
+ if (filters == null) {
+ filters = new Hashtable(5);
+ }
+ filters.put(extension.toLowerCase(), this);
+ fullDescription = null;
+ }
+
+
+ /**
+ * Returns the human readable description of this filter. For
+ * example: "JPEG and GIF Image Files (*.jpg, *.gif)"
+ *
+ * @see FileFilter#getDescription
+ */
+ @Override
+ public String getDescription() {
+ if (fullDescription == null) {
+ if (description == null || isExtensionListInDescription()) {
+ fullDescription = description == null ? "(" : description + " (";
+ // build the description from the extension list
+ Enumeration extensions = filters.keys();
+ if (extensions != null) {
+ fullDescription += "." + extensions.nextElement();
+ while (extensions.hasMoreElements()) {
+ fullDescription += ", ." + extensions.nextElement();
+ }
+ }
+ fullDescription += ")";
+ } else {
+ fullDescription = description;
+ }
+ }
+ return fullDescription;
+ }
+
+ /**
+ * Sets the human readable description of this filter. For
+ * example: filter.setDescription("Gif and JPG Images");
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ fullDescription = null;
+ }
+
+ /**
+ * Determines whether the extension list (.jpg, .gif, etc) should
+ * show up in the human readable description.
+ *
+ * Only relevent if a description was provided in the constructor
+ * or using setDescription();
+ */
+ public void setExtensionListInDescription(boolean b) {
+ useExtensionsInDescription = b;
+ fullDescription = null;
+ }
+
+ /**
+ * Returns whether the extension list (.jpg, .gif, etc) should
+ * show up in the human readable description.
+ *
+ * Only relevent if a description was provided in the constructor
+ * or using setDescription();
+ */
+ public boolean isExtensionListInDescription() {
+ return useExtensionsInDescription;
+ }
+ }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/os/impl/PMDialogAction.java b/designer-base/src/main/java/com/fr/design/os/impl/PMDialogAction.java
index 990e73ee9c..16944da068 100644
--- a/designer-base/src/main/java/com/fr/design/os/impl/PMDialogAction.java
+++ b/designer-base/src/main/java/com/fr/design/os/impl/PMDialogAction.java
@@ -1,6 +1,7 @@
package com.fr.design.os.impl;
import com.fr.config.ServerPreferenceConfig;
+import com.fr.design.DesignerEnvManager;
import com.fr.design.extra.WebViewDlgHelper;
import com.fr.design.jdk.JdkVersion;
import com.fr.design.upm.UpmFinder;
@@ -23,7 +24,9 @@ public class PMDialogAction implements OSBasedAction {
DesignUtils.visitEnvServerByParameters( PLUGIN_MANAGER_ROUTE,null,null);
return;
}
- if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM() || SupportOSImpl.MACOS_NEW_PLUGIN_MANAGEMENT.support()) {
+ if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM()
+ || SupportOSImpl.MACOS_NEW_PLUGIN_MANAGEMENT.support()
+ || DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter()) {
UpmFinder.showUPMDialog();
} else {
WebViewDlgHelper.createPluginDialog();
diff --git a/designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java b/designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
index e8871154e6..5751c3ecb9 100644
--- a/designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
+++ b/designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
@@ -8,13 +8,18 @@ import com.fr.general.GeneralContext;
import com.fr.json.JSON;
import com.fr.json.JSONFactory;
import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
import com.fr.stable.os.Arch;
import com.fr.stable.os.OperatingSystem;
import com.fr.stable.os.support.SupportOS;
import com.fr.workspace.WorkContext;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Locale;
+import java.util.Scanner;
/**
* @author pengda
@@ -143,6 +148,45 @@ public enum SupportOSImpl implements SupportOS {
}
},
+ OLD_STYLE_CHOOSER {
+
+ @Override
+ public boolean support() {
+ return (OperatingSystem.isLinux() && Arch.getArch() == Arch.ARM) || MACOS_12_VERSION_ADAPTER.support();
+ }
+ },
+
+ MACOS_12_VERSION_ADAPTER {
+ @Override
+ public boolean support() {
+ return (OperatingSystem.isMacos() && getMacOsVersionNumber() >= macosMontereyVersionNum);
+ }
+
+ private final int macosMontereyVersionNum = 12;
+
+ /**
+ * System.getProperty("os.version") 在最新macos版本存在bug
+ * https://bugs.openjdk.java.net/browse/JDK-8253702
+ *
+ * @return
+ */
+ private int getMacOsVersionNumber() {
+ String result;
+ List command = new ArrayList<>();
+ command.add("/usr/bin/sw_vers");
+ command.add("-productVersion");
+ try (InputStream inputStream = new ProcessBuilder(command).start().getInputStream();
+ Scanner s = new Scanner(inputStream).useDelimiter("\\A")) {
+ result = s.hasNext() ? s.next() : StringUtils.EMPTY;
+ String[] versionSlice = result.split("\\.");
+ return Integer.parseInt(versionSlice[0]);
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().warn(e.getMessage(), e);
+ return 0;
+ }
+ }
+ },
+
DESIGNER_LOGIN {
@Override
public boolean support() {
diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java
index 0cc211c5f1..e79bfcf6b8 100644
--- a/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java
+++ b/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java
@@ -1,5 +1,6 @@
package com.fr.design.report;
+import com.fr.base.iofile.attr.WaterMarkProvideConstant;
import com.fr.base.iofile.attr.WatermarkAttr;
import com.fr.design.dialog.AbstractTemplateServerSettingPane;
import com.fr.report.core.ReportUtils;
@@ -42,13 +43,13 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
}
public void populate(WatermarkAttr watermark) {
- if (!watermark.isValid()) {
+ if (watermark.getWaterMarkProvider().equals(WaterMarkProvideConstant.TEMPLATE)) {
+ chooseComboBox.setSelectedIndex(SINGLE_SET);
+ watermarkPane.populate(watermark);
+ } else {
chooseComboBox.setSelectedIndex(SERVER_SET);
populateServerSettings();
- return;
}
- chooseComboBox.setSelectedIndex(SINGLE_SET);
- watermarkPane.populate(watermark);
}
diff --git a/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java b/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java
index 9c5b1af4d1..739dc81d55 100644
--- a/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java
+++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java
@@ -4,62 +4,47 @@
package com.fr.design.style.background.image;
import com.fr.design.DesignerEnvManager;
-import com.fr.design.gui.ifilechooser.FileSelectionMode;
-import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
-import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ifilechooser.FileChooserFactory;
+import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.share.collect.ComponentCollector;
import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
-import javafx.stage.FileChooser;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+
+import java.awt.Component;
import java.io.File;
+import javax.swing.SwingUtilities;
/**
* This class used to choose image files.
*/
public class ImageFileChooser {
-
- JavaFxNativeFileChooser javaFxNativeFileChooser;
+ private final FileChooserProvider fileChooserProvider;
public ImageFileChooser() {
- javaFxNativeFileChooser =
- new JavaFxNativeFileChooser.Builder().
- fileSelectionMode(FileSelectionMode.FILE).
- title(Toolkit.i18nText("Fine-Design_Basic_Open")).
- filter(Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"), "*.jpg", "*.gif", "*.png", "*.bmp").
- build();
+ fileChooserProvider = FileChooserFactory.createImageFileChooser();
}
public int showOpenDialog(Component parent, String approveButtonText) {
- return showOpenDialog(parent);
+ return fileChooserProvider.showOpenDialog(parent, approveButtonText);
}
public int showOpenDialog(Component parent) {
showImageCompressMoveTip();
- return javaFxNativeFileChooser.showDialog(parent);
+ return fileChooserProvider.showDialog(parent);
}
public void setCurrentDirectory(File file) {
- javaFxNativeFileChooser.setCurrentDirectory(file);
+ fileChooserProvider.setCurrentDirectory(file);
}
public void setMultiSelectionEnabled(boolean multiple) {
- if (multiple) {
- javaFxNativeFileChooser.setSelectionMode(FileSelectionMode.MULTIPLE_FILE);
- } else {
- javaFxNativeFileChooser.setSelectionMode(FileSelectionMode.FILE);
- }
+ fileChooserProvider.setMultiSelectionEnabled(multiple);
}
public File getSelectedFile() {
- return javaFxNativeFileChooser.getSelectedFile();
+ return fileChooserProvider.getSelectedFile();
}
public boolean isCheckSelected() {
diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java
index fee07ac467..01369116d7 100644
--- a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java
+++ b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java
@@ -14,9 +14,10 @@ import com.fr.design.extra.exe.GetPluginPrefixExecutor;
import com.fr.design.extra.exe.PluginLoginExecutor;
import com.fr.design.extra.exe.ReadUpdateOnlineExecutor;
import com.fr.design.extra.exe.SearchOnlineExecutor;
+import com.fr.design.gui.ifilechooser.FileChooserArgs;
+import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ifilechooser.FileSelectionMode;
-import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
import com.fr.design.i18n.Toolkit;
import com.fr.design.locale.impl.BbsRegisterMark;
import com.fr.design.locale.impl.BbsResetMark;
@@ -39,11 +40,12 @@ import com.teamdev.jxbrowser.chromium.Browser;
import com.teamdev.jxbrowser.chromium.JSArray;
import com.teamdev.jxbrowser.chromium.JSFunction;
import com.teamdev.jxbrowser.chromium.JSObject;
-import javafx.stage.FileChooser;
-import javax.swing.*;
+import java.awt.Desktop;
+import javax.swing.JFileChooser;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
import javax.swing.filechooser.FileNameExtensionFilter;
-import java.awt.*;
import java.io.File;
import java.net.URI;
import java.util.ArrayList;
@@ -312,10 +314,10 @@ public class UpmBridge {
RunnableFuture future = new FutureTask<>(new Callable() {
@Override
public String call() {
- FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().
- fileSelectionMode(FileSelectionMode.FILE).
- filter(des, filter).
- build();
+ FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(
+ FileChooserArgs.newBuilder().
+ setFileSelectionMode(FileSelectionMode.FILE).
+ setFilter(des, filter).build());
int result = fileChooserProvider.showDialog(UpmFinder.getDialog());
if (result == JFileChooser.APPROVE_OPTION) {
return fileChooserProvider.getSelectedFile().getAbsolutePath();
diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
index 56f90e804e..31bdaa979b 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
+++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
@@ -9,9 +9,10 @@ import com.fr.design.fun.DesignerEnvProcessor;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ifilechooser.FileChooserArgs;
+import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ifilechooser.FileSelectionMode;
-import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ipasswordfield.UIPassWordField;
import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
@@ -564,7 +565,8 @@ public class RemoteEnvPane extends BasicBeanPane {
fileChooserButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent evt) {
- FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().fileSelectionMode(FileSelectionMode.FILE).build();
+ FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(FileChooserArgs.newBuilder().
+ setFileSelectionMode(FileSelectionMode.FILE).build());
int saveValue = fileChooserProvider.showDialog(SwingUtilities.getWindowAncestor(RemoteEnvPane.this));
if (saveValue == JFileChooser.APPROVE_OPTION) {
File selectedFile = fileChooserProvider.getSelectedFile();
diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java
index 133e2fef74..a5351c74bf 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java
@@ -9,8 +9,9 @@ import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icombobox.FilterComboBox;
+import com.fr.design.gui.ifilechooser.FileChooserArgs;
+import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider;
-import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
import com.fr.design.gui.ilable.BoldFontTextLabel;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.DesignerContext;
@@ -19,8 +20,6 @@ import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralUtils;
import com.fr.general.data.DataModel;
import com.fr.log.FineLoggerFactory;
-import com.fr.stable.StringUtils;
-import org.apache.batik.swing.svg.SVGFileFilter;
import javax.swing.JFileChooser;
import javax.swing.JPanel;
@@ -110,10 +109,12 @@ public class MapCustomPane extends BasicBeanPane implements AbstrctMapAt
private ActionListener selectPictureActionListener = new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent evt) {
- FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().
- filter(".svg, .svgz", "*.svg", "*.svgz").
- currentDirectory(lastSelectPath).build();
+ FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(
+ FileChooserArgs.newBuilder().
+ setFilter(".svg, .svgz", "*.svg", "*.svgz").
+ setSelectedPath(lastSelectPath).build());
int returnVal = fileChooserProvider.showDialog(DesignerContext.getDesignerFrame());
if (returnVal != JFileChooser.CANCEL_OPTION) {
File selectedFile = fileChooserProvider.getSelectedFile();
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/action/InstallComponentAction.java b/designer-form/src/main/java/com/fr/design/mainframe/share/action/InstallComponentAction.java
index 03e8ab2c07..d0b6d354a8 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/action/InstallComponentAction.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/action/InstallComponentAction.java
@@ -4,10 +4,11 @@ import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.gui.ifilechooser.ExtensionFilter;
+import com.fr.design.gui.ifilechooser.FileChooserArgs;
+import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ifilechooser.FileSelectionMode;
-import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
-import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.share.ui.base.FailureMessagePane;
@@ -15,17 +16,13 @@ import com.fr.design.mainframe.share.ui.local.LocalWidgetRepoPane;
import com.fr.design.mainframe.share.util.InstallUtils;
import com.fr.design.mainframe.share.util.ShareComponentUtils;
import com.fr.design.mainframe.share.util.ShareUIUtils;
-import com.fr.design.os.impl.SupportOSImpl;
import com.fr.form.share.record.ShareWidgetInfoManager;
import com.fr.form.share.utils.ReuxUtils;
import com.fr.log.FineLoggerFactory;
-import com.sun.javafx.tk.FileChooserType;
-import javafx.stage.FileChooser;
import javax.swing.Action;
import javax.swing.JFileChooser;
import javax.swing.SwingWorker;
-import javax.swing.filechooser.FileNameExtensionFilter;
import java.awt.event.ActionEvent;
import java.io.File;
import java.util.ArrayList;
@@ -46,15 +43,16 @@ public class InstallComponentAction extends UpdateAction {
@Override
public void actionPerformed(ActionEvent e) {
- FileChooserProvider fileChooserProvider =
- new JavaFxNativeFileChooser.Builder().
- fileSelectionMode(FileSelectionMode.MULTIPLE_FILE).
- title(Toolkit.i18nText("Fine-Design_Basic_Select")).
- filters(new FileChooser.ExtensionFilter[]{
- new FileChooser.ExtensionFilter("reu", "*.reu"),
- new FileChooser.ExtensionFilter("reus", "*.reus"),
- new FileChooser.ExtensionFilter("zip", "*.zip")}).
- build();
+ FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(
+ FileChooserArgs.newBuilder().
+ setFileSelectionMode(FileSelectionMode.MULTIPLE_FILE).
+ setMultiSelectionEnabled(true).
+ setTipText(Toolkit.i18nText("Fine-Design_Basic_Select")).
+ setFilters(new ExtensionFilter[] {
+ new ExtensionFilter("reu", "*.reu"),
+ new ExtensionFilter("reus", "*.reus"),
+ new ExtensionFilter("zip", "*.zip"),
+ }).build());
int returnValue = fileChooserProvider.showDialog(null);
installComponent(returnValue, fileChooserProvider.getSelectedFiles());
}