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 1f39f024d..b57ad6c7a 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 c0797e946..5a777b895 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 != null && 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/file/HistoryTemplateListCache.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
index 920ecb78c..443a55671 100644
--- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
+++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
@@ -15,7 +15,6 @@ import com.fr.design.mainframe.JVirtualTemplate;
import com.fr.design.ui.util.UIUtil;
import com.fr.file.FILE;
import com.fr.file.FileNodeFILE;
-import com.fr.file.StashedFILE;
import com.fr.general.ComparatorUtils;
import com.fr.invoke.ClassHelper;
import com.fr.log.FineLoggerFactory;
@@ -25,7 +24,7 @@ import com.fr.stable.CoreConstants;
import com.fr.stable.StringUtils;
import com.fr.third.org.apache.commons.io.FilenameUtils;
-import java.io.ByteArrayOutputStream;
+import javax.swing.SwingWorker;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -33,7 +32,6 @@ import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
-import javax.swing.SwingWorker;
/**
* 历史模板缓存
@@ -364,7 +362,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
int size = historyList.size();
for (int i = 0; i < size; i++) {
JTemplate template = historyList.get(i);
- FILE file = templateToStashFile(template);
+ FILE file = template.templateToStashFile();
if (file != null) {
stashFILEMap.put(i, file);
}
@@ -372,21 +370,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
FineLoggerFactory.getLogger().info("Env Change Template Stashed.");
}
- private FILE templateToStashFile(JTemplate template) {
- FILE file = template.getEditingFILE();
- try {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- BaseBook target = template.getTarget();
- if (target != null) {
- target.export(outputStream);
- return new StashedFILE(file, outputStream.toByteArray(), template.suffix());
- }
- // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
- } catch (Exception e) {
- FineLoggerFactory.getLogger().error(e.getMessage(), e);
- }
- return null;
- }
private boolean checkStash() {
try {
@@ -469,7 +452,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
FILE file = template.getEditingFILE();
boolean needReload = context == null || needReloadTemplate(context, template);
if (needReload) {
- FILE stashFile = templateToStashFile(template);
+ FILE stashFile = template.templateToStashFile();
if (stashFile != null) {
FineLoggerFactory.getLogger().info("{} is being reloaded", file.getName());
template.refreshResource(stashFile);
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 a4354ee9d..795ff721f 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
@@ -814,10 +814,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
String formulaText = formulaTextArea.getText().trim();
String unSupportFormula = containsUnsupportedSimulationFormulas(formulaText);
if (unSupportFormula != null) {
- showMessageDialog(Toolkit.i18nText("Fine-Design_Basic_Formula_Unsupported_Formulas") + ":" + unSupportFormula, false);
+ showMessageDialog(Toolkit.i18nText("Fine-Design_Basic_Formula_Unsupported_Formulas") + ":" + unSupportFormula, false, true);
return;
}
+ boolean calException = false;
String messageTips;
FormulaCheckResult checkResult = FormulaChecker.check(formulaText);
if (checkResult.grammarValid()) {
@@ -846,6 +847,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
} catch (Exception ce) {
//模拟计算如果出现错误，则抛出错误
calResult = ce.getMessage();
+ calException = true;
FineLoggerFactory.getLogger().error(ce.getMessage(), ce);
messageTips = messageTips + Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Error") + ":" + calResult;
}
@@ -854,7 +856,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
messageTips = checkResult.getTips();
}
if (checkResult.isValid()) {
- showMessageDialog(messageTips, checkResult.isValid());
+ showMessageDialog(messageTips, checkResult.isValid(), calException);
} else {
confirmCheckResult(checkResult, messageTips);
}
@@ -871,7 +873,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
private boolean confirmCheckResult(FormulaCheckResult checkResult, String messageTips) {
if (checkResult.isValid()) {
- showMessageDialog(checkResult.getTips(), checkResult.isValid());
+ showMessageDialog(checkResult.getTips(), checkResult.isValid(), false);
} else {
int columns = checkResult.getFormulaCoordinates().getColumns();
String position = StringUtils.EMPTY;
@@ -897,8 +899,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
return true;
}
- private void showMessageDialog(String message, boolean formulaValid) {
- if (formulaValid) {
+ private void showMessageDialog(String message, boolean formulaValid, boolean calException) {
+ if (formulaValid && !calException) {
FineJOptionPane.showMessageDialog(
FormulaPane.this,
message);
diff --git a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/ExtensionFilter.java b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/ExtensionFilter.java
new file mode 100644
index 000000000..9ec582f69
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/ExtensionFilter.java
@@ -0,0 +1,25 @@
+package com.fr.design.gui.ifilechooser;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/29
+ */
+public class ExtensionFilter {
+
+ private final String des;
+ private final String[] extensions;
+
+ public ExtensionFilter(String des, String... extensions) {
+ this.des = des;
+ this.extensions = extensions;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public String[] getExtensions() {
+ return extensions;
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserArgs.java b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserArgs.java
new file mode 100644
index 000000000..b011e5b35
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserArgs.java
@@ -0,0 +1,109 @@
+package com.fr.design.gui.ifilechooser;
+
+/**
+ * 文件选择器可设置的参数集合
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/21
+ */
+public class FileChooserArgs {
+
+ private final FileSelectionMode fileSelectionMode;
+ private final String filterDes;
+ private final String[] extensions;
+ private final String selectedPath;
+ private final ExtensionFilter[] filters;
+ private final String tipText;
+ private final boolean multiSelectionEnabled;
+
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ private FileChooserArgs(Builder builder) {
+ this.fileSelectionMode = builder.fileSelectionMode;
+ this.filterDes = builder.filterDes;
+ this.extensions = builder.extensions;
+ this.selectedPath = builder.selectedPath;
+ this.filters = builder.filters;
+ this.tipText = builder.tipText;
+ this.multiSelectionEnabled = builder.multiSelectionEnabled;
+ }
+
+ public FileSelectionMode getFileSelectionMode() {
+ return fileSelectionMode;
+ }
+
+ public String getFilterDes() {
+ return filterDes;
+ }
+
+ public String[] getExtensions() {
+ return extensions;
+ }
+
+ public String getSelectedPath() {
+ return selectedPath;
+ }
+
+ public ExtensionFilter[] getFilters() {
+ return filters;
+ }
+
+ public String getTipText() {
+ return tipText;
+ }
+
+ public boolean isMultiSelectionEnabled() {
+ return multiSelectionEnabled;
+ }
+
+ public static class Builder {
+
+ private FileSelectionMode fileSelectionMode;
+ private String filterDes;
+ private String[] extensions;
+ private String selectedPath;
+ private ExtensionFilter[] filters = new ExtensionFilter[0];
+ private String tipText;
+ private boolean multiSelectionEnabled;
+
+ public Builder setFileSelectionMode(FileSelectionMode fileSelectionMode) {
+ this.fileSelectionMode = fileSelectionMode;
+ return this;
+ }
+
+ public Builder setFilter(String filterDes, String... extensions) {
+ this.filterDes = filterDes;
+ this.extensions = extensions;
+ return this;
+ }
+
+ public Builder setSelectedPath(String selectedPath) {
+ this.selectedPath = selectedPath;
+ return this;
+ }
+
+ public Builder setFilters(ExtensionFilter[] filters) {
+ this.filters = filters;
+ return this;
+ }
+
+ public Builder setTipText(String tipText) {
+ this.tipText = tipText;
+ return this;
+ }
+
+ public Builder setMultiSelectionEnabled(boolean multiSelectionEnabled) {
+ this.multiSelectionEnabled = multiSelectionEnabled;
+ return this;
+ }
+
+ public FileChooserArgs build() {
+ return new FileChooserArgs(this);
+ }
+ }
+
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserFactory.java b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserFactory.java
new file mode 100644
index 000000000..36a53c8dc
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserFactory.java
@@ -0,0 +1,44 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.os.impl.SupportOSImpl;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/21
+ */
+public class FileChooserFactory {
+
+ public static FileChooserProvider createFileChooser(FileChooserArgs fileChooserArgs) {
+ if (SupportOSImpl.OLD_STYLE_CHOOSER.support()) {
+ return new SwingFileChooser.Builder().
+ setFileSelectionMode(fileChooserArgs.getFileSelectionMode()).
+ setFileFilter(fileChooserArgs.getFilterDes(), fileChooserArgs.getExtensions()).
+ setSelectedFile(fileChooserArgs.getSelectedPath()).
+ setMultiSelectionEnabled(fileChooserArgs.isMultiSelectionEnabled()).
+ setTipText(fileChooserArgs.getTipText()).
+ setFileFilter(fileChooserArgs.getFilters()).build();
+ } else {
+ return new JavaFxNativeFileChooser.Builder().
+ fileSelectionMode(fileChooserArgs.getFileSelectionMode()).
+ filter(fileChooserArgs.getFilterDes(), fileChooserArgs.getExtensions()).
+ currentDirectory(fileChooserArgs.getSelectedPath()).
+ title(fileChooserArgs.getTipText()).
+ filters(fileChooserArgs.getFilters()).build();
+ }
+ }
+
+ public static FileChooserProvider createImageFileChooser() {
+ if (SupportOSImpl.OLD_STYLE_CHOOSER.support()) {
+ return new SwingImageFileChooser();
+ } else {
+ return 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();
+ }
+ }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserProvider.java b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserProvider.java
index aa95fe27b..a5d7e9730 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserProvider.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserProvider.java
@@ -9,4 +9,17 @@ public interface FileChooserProvider {
File getSelectedFile();
int showDialog(Component parent);
+
+
+ default int showOpenDialog(Component parent, String approveButtonText) {
+ return -1;
+ }
+
+ default void setMultiSelectionEnabled(boolean multiple) {
+
+ }
+
+ default void setCurrentDirectory(File file) {
+
+ }
}
diff --git a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java
index fc4b8e368..4d3688324 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java
@@ -4,6 +4,8 @@ package com.fr.design.gui.ifilechooser;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
import com.sun.javafx.application.PlatformImpl;
import javafx.application.Platform;
import javafx.scene.Scene;
@@ -173,10 +175,20 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
this.fileSelectionMode = fileSelectionMode;
}
+ @Override
public void setCurrentDirectory(File currentDirectory) {
this.currentDirectory = currentDirectory;
}
+ @Override
+ public void setMultiSelectionEnabled(boolean multiple) {
+ this.setSelectionMode(multiple ? FileSelectionMode.MULTIPLE_FILE : FileSelectionMode.FILE);
+ }
+
+ @Override
+ public int showOpenDialog(Component parent, String approveButtonText) {
+ return this.showDialog(parent);
+ }
public static class Builder {
private FileSelectionMode fileSelectionMode = FileSelectionMode.FILE;
@@ -190,7 +202,9 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
}
public Builder title(String title) {
- this.title = title;
+ if (StringUtils.isNotEmpty(title)) {
+ this.title = title;
+ }
return this;
}
@@ -199,6 +213,13 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
return this;
}
+ public Builder filters(ExtensionFilter[] filters) {
+ for (ExtensionFilter filter : filters) {
+ this.filters = ArrayUtils.add(this.filters, new FileChooser.ExtensionFilter(filter.getDes(), filter.getExtensions()));
+ }
+ return this;
+ }
+
public Builder filter(String des, String... extensions) {
if (extensions != null) {
this.filters = new FileChooser.ExtensionFilter[]{new FileChooser.ExtensionFilter(des, extensions)};
diff --git a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java
new file mode 100644
index 000000000..942c3430c
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java
@@ -0,0 +1,130 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.common.annotations.Negative;
+import com.fr.design.upm.UpmUtils;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
+import java.awt.Component;
+import java.io.File;
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
+import javax.swing.filechooser.FileNameExtensionFilter;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/21
+ */
+@Negative(until = "2022-6-1")
+class SwingFileChooser implements FileChooserProvider {
+
+ private final JFileChooser fileChooser;
+ private final Builder builder;
+
+ private SwingFileChooser(Builder builder) {
+ fileChooser = new JFileChooser();
+ fileChooser.setFileSelectionMode(builder.fileSelectionMode);
+ fileChooser.setFileFilter(builder.fileFilter);
+ fileChooser.setSelectedFile(builder.selectedFile);
+ fileChooser.setMultiSelectionEnabled(builder.multiSelectionEnabled);
+ this.builder = builder;
+ }
+
+ @Override
+ public File[] getSelectedFiles() {
+ return fileChooser.getSelectedFiles();
+ }
+
+ @Override
+ public File getSelectedFile() {
+ return fileChooser.getSelectedFile();
+ }
+
+ @Override
+ public int showDialog(Component parent) {
+ if (StringUtils.isEmpty(builder.tipText)) {
+ return fileChooser.showOpenDialog(parent);
+ } else {
+ return fileChooser.showDialog(parent, builder.tipText);
+ }
+ }
+
+ @Override
+ public int showOpenDialog(Component parent, String approveButtonText) {
+ return fileChooser.showDialog(parent, approveButtonText);
+ }
+
+ @Override
+ public void setCurrentDirectory(File file) {
+ fileChooser.setCurrentDirectory(file);
+ }
+
+ @Override
+ public void setMultiSelectionEnabled(boolean multiple) {
+ fileChooser.setMultiSelectionEnabled(multiple);
+ }
+
+ /**
+ * 和一般builder不同的是 setXXX还做参数转换逻辑
+ */
+ public static class Builder {
+
+ private int fileSelectionMode = JFileChooser.FILES_ONLY;
+ private FileFilter fileFilter;
+ private File selectedFile;
+ private boolean multiSelectionEnabled;
+ private String tipText;
+
+ public Builder setFileSelectionMode(FileSelectionMode fileSelectionMode) {
+ if (FileSelectionMode.DIR.equals(fileSelectionMode)) {
+ this.fileSelectionMode = JFileChooser.DIRECTORIES_ONLY;
+ } else if (FileSelectionMode.FILE.equals(fileSelectionMode)) {
+ this.fileSelectionMode = JFileChooser.FILES_ONLY;
+ } else if (FileSelectionMode.MULTIPLE_FILE.equals(fileSelectionMode)) {
+ this.fileSelectionMode = JFileChooser.FILES_AND_DIRECTORIES;
+ }
+ return this;
+ }
+
+ public Builder setFileFilter(String des, String... extension) {
+ if (StringUtils.isNotEmpty(des) && ArrayUtils.isNotEmpty(extension)) {
+ this.fileFilter = new FileNameExtensionFilter(des, UpmUtils.findMatchedExtension(extension));
+ }
+ return this;
+ }
+
+ public Builder setFileFilter(ExtensionFilter[] extensionFilters) {
+ StringBuilder desBuilder = new StringBuilder();
+ String[] extensions = new String[0];
+ for (ExtensionFilter extensionFilter : extensionFilters) {
+ desBuilder.append(extensionFilter.getDes()).append(" ");
+ extensions = ArrayUtils.addAll(extensions, UpmUtils.findMatchedExtension(extensionFilter.getExtensions()));
+ }
+ if (ArrayUtils.isNotEmpty(extensionFilters)) {
+ this.fileFilter = new FileNameExtensionFilter(desBuilder.toString().trim(), extensions);
+ }
+ return this;
+ }
+
+ public Builder setSelectedFile(String selectedPath) {
+ if (StringUtils.isNotEmpty(selectedPath)) {
+ this.selectedFile = new File(selectedPath);
+ }
+ return this;
+ }
+
+ public Builder setMultiSelectionEnabled(boolean multiSelectionEnabled) {
+ this.multiSelectionEnabled = multiSelectionEnabled;
+ return this;
+ }
+
+ public Builder setTipText(String tipText) {
+ this.tipText = tipText;
+ return this;
+ }
+
+ public SwingFileChooser build() {
+ return new SwingFileChooser(this);
+ }
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingImageFileChooser.java b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingImageFileChooser.java
new file mode 100644
index 000000000..3c0c6c1af
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingImageFileChooser.java
@@ -0,0 +1,276 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.base.BaseUtils;
+import com.fr.common.annotations.Negative;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.style.ChooseFileView;
+import com.fr.design.style.background.image.ExpandFileChooser;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import javax.swing.filechooser.FileFilter;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/30
+ */
+@Negative(until = "2022-6-1")
+class SwingImageFileChooser extends ExpandFileChooser implements FileChooserProvider {
+
+ public SwingImageFileChooser() {
+ super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"));
+ ExampleFileFilter bothFilter = new ExampleFileFilter(
+ new String[]{"jpg", "gif", "png", "bmp"},
+ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"));
+ bothFilter.setExtensionListInDescription(true);
+ this.addChoosableFileFilter(bothFilter);
+ this.setAcceptAllFileFilterUsed(false);
+
+ // Create Custom FileView
+ ChooseFileView fileView = new ChooseFileView();
+ fileView.putIcon("jpg", BaseUtils.readIcon("/com/fr/base/images/dialog/file/jpgFile.gif"));
+ fileView.putIcon("gif", BaseUtils.readIcon("/com/fr/base/images/dialog/file/gifFile.gif"));
+ fileView.putIcon("png", BaseUtils.readIcon("/com/fr/base/images/dialog/file/pngFile.png"));
+ fileView.putIcon("bmp", BaseUtils.readIcon("/com/fr/base/images/dialog/file/bmpFile.gif"));
+
+ this.setFileView(fileView);
+ }
+
+ @Override
+ public int showDialog(Component parent, String approveButtonText) {
+ return super.showDialog(parent, approveButtonText);
+ }
+
+ @Override
+ public ActionListener checkAction() {
+ return new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ DesignerEnvManager.getEnvManager().setImageCompress(isCheckSelected());
+ DesignerEnvManager.getEnvManager().saveXMLFile();
+ }
+ };
+
+ }
+
+ @Override
+ public int showDialog(Component parent) {
+ return showOpenDialog(parent);
+ }
+
+ /**
+ * A convenience implementation of FileFilter that filters out
+ * all files except for those type extensions that it knows about.
+ * D:\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/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index 499898bbf..f1a40ccdc 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -65,6 +65,7 @@ import com.fr.event.EventDispatcher;
import com.fr.file.FILE;
import com.fr.file.FILEChooserPane;
import com.fr.file.MemFILE;
+import com.fr.file.StashedFILE;
import com.fr.form.ui.NoneWidget;
import com.fr.form.ui.Widget;
import com.fr.general.ComparatorUtils;
@@ -104,6 +105,7 @@ import javax.swing.JOptionPane;
import javax.swing.SwingConstants;
import javax.swing.undo.UndoManager;
import java.awt.BorderLayout;
+import java.io.ByteArrayOutputStream;
import java.awt.Dimension;
import java.awt.FontMetrics;
import java.util.Set;
@@ -438,6 +440,22 @@ public abstract class JTemplate>
stopListenThemeConfig();
}
+ public FILE templateToStashFile() {
+ FILE file = this.getEditingFILE();
+ try {
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ BaseBook target = this.getTarget();
+ if (target != null) {
+ target.export(outputStream);
+ return new StashedFILE(file, outputStream.toByteArray(), template.suffix());
+ }
+ // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ return null;
+ }
+
/**
* 刷新内部资源
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 990e73ee9..16944da06 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 e8871154e..5751c3ecb 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/style/background/image/ImageFileChooser.java b/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java
index 9c5b1af4d..739dc81d5 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 fee07ac46..01369116d 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/design/web/CustomIconPane.java b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java
index 9e03dcc9d..564b09d46 100644
--- a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java
+++ b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java
@@ -4,14 +4,14 @@ import com.fr.base.BaseUtils;
import com.fr.base.GraphHelper;
import com.fr.base.Icon;
import com.fr.base.IconManager;
-import com.fr.design.designer.IntervalConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ibutton.UIButton;
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.JavaFxNativeFileChooser;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.iscrollbar.UIScrollBar;
import com.fr.design.gui.itextarea.DescriptionTextArea;
@@ -30,23 +30,35 @@ import com.fr.stable.ListMap;
import com.fr.stable.StringUtils;
import com.fr.transaction.Configurations;
import com.fr.transaction.WorkerFacade;
-import javafx.stage.FileChooser;
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Window;
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.plaf.basic.BasicButtonUI;
-import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
/**
* carl：自定义Icon编辑
@@ -414,7 +426,7 @@ public class CustomIconPane extends BasicPane {
browseButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- onBrowseButtonClicked();
+ onBrowseButtonClicked(SwingUtilities.getWindowAncestor(EditIconDialog.this));
}
});
@@ -449,12 +461,11 @@ public class CustomIconPane extends BasicPane {
this.add(centerPane, BorderLayout.CENTER);
}
- private void onBrowseButtonClicked() {
+ private void onBrowseButtonClicked(Window parent) {
// carl:不知道是否只要png格式,反正导出时全部都转成png了
- FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().
- filter("Icon Image File", "*.jpg", "*.jpeg", "*.png", "*.gif").
- build();
- if (JFileChooser.APPROVE_OPTION == fileChooserProvider.showDialog(DesignerContext.getDesignerFrame())) {
+ FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(FileChooserArgs.newBuilder().
+ setFilter("Icon Image File", "*.jpg", "*.jpeg", "*.png", "*.gif").build());
+ if (JFileChooser.APPROVE_OPTION == fileChooserProvider.showDialog(parent)) {
String path = fileChooserProvider.getSelectedFile().getAbsolutePath();
// 图片存储有最大值48*48限制，没有超过最大值时，按原图大小存储，超过最大值后，压缩至最大值存储
Image image = BaseUtils.readImage(path);
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 56f90e804..31bdaa979 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 133e2fef7..a5351c74b 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 03e8ab2c0..d0b6d354a 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());
}
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java
index b48b74e67..52ea26bc2 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java
@@ -24,6 +24,7 @@ public class OnlineWidgetTabPane extends JPanel {
private static final String COMPONENT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share");
private static final String COMPONENT_PACKAGE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_Package");
private static final String COMPONENT_EMBED = "COMPONENT_EMBED";
+ private UITabGroup headGroup;
private CardLayout cardLayout;
private JPanel centerPane;
private boolean packagePaneCreated = false;
@@ -43,7 +44,7 @@ public class OnlineWidgetTabPane extends JPanel {
this.centerPane.add(new OnlineWidgetShowPane(sharableWidgets), COMPONENT);
this.centerPane.add( embedFilterShowPane = new OnlineEmbedFilterShowPane(new OnlineWidgetShowPane(sharableWidgets, OnlineWidgetSortType.SALES)), COMPONENT_EMBED);
//延迟组件包面板的初始化，防止组件面板里组件的缩略图和组件包面板里组件的缩略图一起加载
- UITabGroup headGroup = new UITabGroup(new String[]{COMPONENT, COMPONENT_PACKAGE}) {
+ this.headGroup = new UITabGroup(new String[]{COMPONENT, COMPONENT_PACKAGE}) {
public void tabChanged(int newSelectedIndex) {
for (TabChangeListener changeListener : tabChangeListeners) {
changeListener.tabChange(newSelectedIndex);
@@ -63,7 +64,7 @@ public class OnlineWidgetTabPane extends JPanel {
}
};
- headGroup.setSelectedIndex(0);
+ this.headGroup.setSelectedIndex(0);
this.centerPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
jPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
@@ -84,6 +85,7 @@ public class OnlineWidgetTabPane extends JPanel {
}
}
public void refreshPane() {
+ this.headGroup.setSelectedIndex(0);
this.cardLayout.show(centerPane, ComponentShareUtil.needShowEmbedFilterPane() ? COMPONENT_EMBED : COMPONENT);
}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
index 0497828c7..327d0555c 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
@@ -11,10 +11,14 @@ import com.fr.design.mainframe.alphafine.cell.model.MoreModel;
import com.fr.design.mainframe.alphafine.model.SearchResult;
import com.fr.design.mainframe.alphafine.search.manager.fun.AlphaFineSearchProvider;
import com.fr.file.filetree.FileNode;
+import com.fr.file.filetree.FileNodes;
import com.fr.general.ComparatorUtils;
import com.fr.json.JSONObject;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
import com.fr.stable.StringUtils;
import com.fr.stable.project.ProjectConstants;
+import com.fr.workspace.WorkContext;
/**
@@ -74,7 +78,12 @@ public class FileSearchManager implements AlphaFineSearchProvider {
return lessModelList;
}
AlphaFineHelper.checkCancel();
- fileNodes = FRContext.getFileNodes().list(ProjectConstants.REPORTLETS_NAME, AlphaFineConstants.FILE_EXTENSIONS, true);
+ fileNodes = WorkContext.getCurrent().get(FileNodes.class, new ExceptionHandler() {
+ @Override
+ public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+ return FRContext.getFileNodes().list(ProjectConstants.REPORTLETS_NAME, AlphaFineConstants.FILE_EXTENSIONS, true);
+ }
+ }).list(ProjectConstants.REPORTLETS_NAME, AlphaFineConstants.FILE_EXTENSIONS, true, false);
isContainCpt = true;
isContainFrm = true;
doSearch(this.searchText);
@@ -128,7 +137,12 @@ public class FileSearchManager implements AlphaFineSearchProvider {
*/
private void doFileContentSearch(String searchText) {
if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainFileContent()) {
- FileNode[] fileNodes = FRContext.getFileNodes().filterFiles(searchText, ProjectConstants.REPORTLETS_NAME, new FileExtension[]{FileExtension.CPT, FileExtension.FRM}, true);
+ FileNode[] fileNodes = WorkContext.getCurrent().get(FileNodes.class, new ExceptionHandler() {
+ @Override
+ public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+ return FRContext.getFileNodes().filterFiles(searchText, ProjectConstants.REPORTLETS_NAME, new FileExtension[]{FileExtension.CPT, FileExtension.FRM}, true);
+ }
+ }).filterFiles(searchText, ProjectConstants.REPORTLETS_NAME, new FileExtension[]{FileExtension.CPT, FileExtension.FRM}, true, false);
for (FileNode node : fileNodes) {
FileModel model = new FileModel(node.getName(), node.getEnvPath());
if (!AlphaFineHelper.getFilterResult().contains(model) && !filterModelList.contains(model)) {
diff --git a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
index 3818f1ac8..193fd4de9 100644
--- a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
+++ b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
@@ -291,6 +291,10 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
@Override
public void checkValid() throws Exception {
KeyColumnTableModel model = (KeyColumnTableModel) keyColumnValuesTable.getModel();
+ checkModelValid(model);
+ }
+
+ private void checkModelValid(KeyColumnTableModel model) throws Exception {
int cnt = model.getRowCount();
int groupLength = -1;
for (int i = 0; i < cnt; i++) {
@@ -374,7 +378,8 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
*/
@Override
public void checkValid() throws Exception {
- SmartInsertDBManipulationPane.this.checkValid();
+ KeyColumnTableModel model = (KeyColumnTableModel) table.getModel();
+ SmartInsertDBManipulationPane.this.checkModelValid(model);
}
private SelectionListener listener = new SelectionListener() {
diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
index 56b578578..eea3360ba 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
@@ -10,6 +10,7 @@ import com.fr.base.theme.migrator.FormThemeConfigMigrator;
import com.fr.base.theme.migrator.ReportThemeConfigMigrator;
import com.fr.chart.chartattr.ChartCollection;
import com.fr.config.MarketConfig;
+import com.fr.config.ServerPreferenceConfig;
import com.fr.decision.update.backup.RecoverManager;
import com.fr.design.DesignerEnvManager;
import com.fr.design.ExtraDesignClassManager;
@@ -187,6 +188,9 @@ public class DesignerActivator extends Activator implements Prepare {
//生成BasicChartQuickEditor对象，需要用到ChartDesignerActivator的注册信息（DesignModuleFactory.registerChartPropertyPaneClass(ChartPropertyPane.class);）
//所以不能在registerCellEditor函数中进行注册
ActionFactory.registerCellEditor(ChartCollection.class, new BasicChartQuickEditor());
+ if (DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter() && WorkContext.getCurrent().isLocal()) {
+ ServerPreferenceConfig.getInstance().setUseOptimizedUPM(DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter());
+ }
}
private void loadLogAppender() {