Merge remote-tracking branch 'origin/release/10.0' into release/10.0

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -1,6 +1,7 @@
 package com.fr.design.actions.file;
 
 import com.fr.cluster.ClusterBridge;
+import com.fr.cluster.engine.base.FineClusterConfig;
 import com.fr.config.Configuration;
 import com.fr.config.ServerPreferenceConfig;
 import com.fr.design.DesignerEnvManager;
@@ -263,7 +264,7 @@ public class PreferencePane extends BasicPane {
             @Override
             public void stateChanged(ChangeEvent e) {
                 boolean selected = vcsEnableCheckBox.isSelected();
-                if (selected) {
+                if (selected && vcsEnableCheckBox.isEnabled()) {
                     saveCommitCheckBox.setEnabled(true);
                     saveIntervalEditor.setEnabled(true);
                     useIntervalCheckBox.setEnabled(true);
@@ -307,14 +308,9 @@ public class PreferencePane extends BasicPane {
         gcEnableCheckBox.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
-                gcButton.setEnabled(gcEnableCheckBox.isSelected());
+                gcButton.setEnabled(gcEnableCheckBox.isSelected() && gcEnableCheckBox.isEnabled());
             }
         });
-        //集群下禁用
-        if (ClusterBridge.isClusterMode()) {
-            gcEnableCheckBox.setEnabled(false);
-            gcButton.setEnabled(false);
-        }
         return gcControlPane;
     }
 
@@ -672,6 +668,11 @@ public class PreferencePane extends BasicPane {
             defaultStringToFormulaBox.setSelected(false);
         }
         VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
+        if (FineClusterConfig.getInstance().isCluster()) {
+            vcsEnableCheckBox.setEnabled(false);
+            gcEnableCheckBox.setEnabled(false);
+        }
+
         if (VcsHelper.getInstance().needInit()) {
             vcsEnableCheckBox.setSelected(vcsConfigManager.isVcsEnable());
         } else {

designer-base/src/main/java/com/fr/design/fun/ReportSupportedFileUIProvider.java

@@ -1,6 +1,5 @@
 package com.fr.design.fun;
 
-import com.fr.base.extension.FileExtension;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.file.FILEChooserPane;
 import com.fr.stable.fun.mark.Mutable;
@@ -24,13 +23,6 @@ public interface ReportSupportedFileUIProvider extends Mutable {
     void addChooseFileFilter(FILEChooserPane fileChooser, String suffix);
 
 
-    /**
-     * 获取可支持的文件类型
-     * @return 文件扩展
-     */
-    FileExtension[] getFileExtensions();
-
-
     /**
      * 获取文件关联的icon
      * @param path 文件路径

designer-base/src/main/java/com/fr/design/fun/impl/AbstractReportSupportedFileUIProvider.java

@@ -1,6 +1,5 @@
 package com.fr.design.fun.impl;
 
-import com.fr.base.extension.FileExtension;
 import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.file.FILEChooserPane;
@@ -19,12 +18,6 @@ public abstract class AbstractReportSupportedFileUIProvider extends AbstractProv
 
     }
 
-    @Override
-    public FileExtension[] getFileExtensions() {
-        return new FileExtension[0];
-    }
-
-
     @Override
     public Icon getFileIcon(String path, boolean isShowLock) {
         return null;

designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeConstants.java

@@ -2,14 +2,14 @@ package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.FRContext;
 import com.fr.base.extension.FileExtension;
-import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.general.GeneralContext;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.manage.PluginFilter;
 import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
+import com.fr.report.ExtraReportClassManager;
+import com.fr.report.fun.ReportSupportedFileProvider;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -58,8 +58,8 @@ public class FileNodeConstants {
             rwl.writeLock().lock();
             supportFileType = new ArrayList<String>();
             //通过插件扩展的
-            Set<ReportSupportedFileUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ReportSupportedFileUIProvider.XML_TAG);
+            Set<ReportSupportedFileProvider> providers = ExtraReportClassManager.getInstance().getArray(ReportSupportedFileProvider.XML_TAG);
-            for (ReportSupportedFileUIProvider provider : providers) {
+            for (ReportSupportedFileProvider provider : providers) {
                 addAppExtensions(provider.getFileExtensions());
             }
             supportFileType.addAll(Arrays.asList(FRContext.getFileNodes().getSupportedTypes()));

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

@@ -661,6 +661,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             result = result || this.saveFile();
             //更换最近打开
             DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getPath());
+            this.refreshToolArea();
         }
         return result;
     }

designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.log.Log4jConfig;
 import com.fr.log.FineLoggerFactory;
@@ -199,6 +200,7 @@ public class DesignerLogHandler {
             jTextArea.addMouseListener(new MouseAdapter() {
 
                 // check for right click
+                @Override
                 public void mousePressed(MouseEvent event) {
 
                     if (event.getButton() == MouseEvent.BUTTON3) {
@@ -219,6 +221,7 @@ public class DesignerLogHandler {
             ActionMap actionMap = resultPane.getActionMap();
             actionMap.put("clear", new AbstractAction() {
 
+                @Override
                 public void actionPerformed(ActionEvent evt) {
 
                     resultPane.setText("");
@@ -260,21 +263,25 @@ public class DesignerLogHandler {
             printMessage(message, intLevel, date, null);
         }
 
-        private void printMessage(String msg, int intLevel, Date date, Throwable e) {
+        private void printMessage(final String msg, final int intLevel, final Date date, final Throwable e) {
-            
+            UIUtil.invokeLaterIfNeeded(new Runnable() {
-            this.log(LOG_SIMPLE_DATE_FORMAT.format(date) + "\n", 0);
+                @Override
+                public void run() {
+                    LogHandlerArea.this.log(LOG_SIMPLE_DATE_FORMAT.format(date) + "\n", 0);
                     String message = appendLocaleMark(msg, intLevel);
-            this.log(message, intLevel);
+                    LogHandlerArea.this.log(message, intLevel);
                     setMessage(message, intLevel);
                     if (e == null) {
                         return;
                     }
 
                     StackTraceElement[] traceElements = e.getStackTrace();
-            for (int i = 0; i < traceElements.length; i++) {
+                    for (StackTraceElement traceElement : traceElements) {
-                this.log("\t" + "at " + traceElements[i].toString() + "\n", 0);
+                        LogHandlerArea.this.log("\t" + "at " + traceElement.toString() + "\n", 0);
                     }
                 }
+            });
+        }
 
         private void log(String str, int style) {
 
@@ -346,6 +353,7 @@ public class DesignerLogHandler {
 
         ActionListener popupListener = new ActionListener() {
 
+            @Override
             public void actionPerformed(ActionEvent evt) {
 
                 if (ComparatorUtils.equals(evt.getActionCommand(), LogHandlerArea.this.selectAll.getText())) {

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java

@@ -50,7 +50,7 @@ public class ReportFitAttrPane extends BasicBeanPane<ReportFitAttr> {
      * @return 标题
      */
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Attr");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_PC_Element_Case_Fit_Attr");
     }
 
 }

designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java

@@ -50,6 +50,6 @@ public class TemplateFitAttrPane extends BasicBeanPane<ReportFitAttr> {
      * @return 标题
      */
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Attr");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_PC_Fit_Attr");
     }
 }

designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java

@@ -143,7 +143,6 @@ public class RestoreResultDialog extends JDialog {
         jTextArea.setFont(new Font("Default", Font.PLAIN, 12));
         infoPane.add(jTextArea);
         pane.add(infoPane, BorderLayout.CENTER);
-
         this.setSize(RESTORE_OLD_VERSION);
         this.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Updater_Restore_to_V8"));
     }
@@ -162,34 +161,68 @@ public class RestoreResultDialog extends JDialog {
         List<String> list = new ArrayList<>();
         String installHome = StableUtils.getInstallHome();
 
-        putJarBackupFilesToInstallLib(installHome, map, list);
+        filesToMove(installHome, map);
-        putJarBackupFilesToInstallEnv(installHome, map, list);
+        filesToDelete(installHome, list);
         RestartHelper.saveFilesWhichToMove(map);
         RestartHelper.saveFilesWhichToDelete(list.toArray(new String[list.size()]));
     }
 
-    private void putJarBackupFilesToInstallLib(String installHome, Map<String, String> map, List<String> list) {
+    private void filesToMove(String installHome, Map<String, String> map) {
         String backupDir = UpdateConstants.DESIGNER_BACKUP_DIR;
+        String envHome = WorkContext.getCurrent().getPath();
         File installLib = new File(StableUtils.pathJoin(installHome, backupDir, jarRestoreDir, UpdateConstants.DESIGNERBACKUPPATH));
-        File[] files = installLib.listFiles();
+        File envLib = new File(StableUtils.pathJoin(installHome, backupDir, jarRestoreDir, UpdateConstants.BACKUPPATH));
+        File[] files;
+        if (installLib.exists() && envLib.exists()) {
+            files = installLib.listFiles();
             if (files != null) {
                 for (File file : files) {
                     map.put(file.getAbsolutePath(),
                             StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file.getName()));
-                list.add(StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file.getName()));
+                }
+            }
+            files = envLib.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    map.put(file.getAbsolutePath(),
+                            StableUtils.pathJoin(envHome, ProjectConstants.LIB_NAME, file.getName()));
+                }
+            }
+        } else {
+            installLib = new File(StableUtils.pathJoin(installHome, backupDir, jarRestoreDir));
+            files = installLib.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    if (file.getName().contains(UpdateConstants.DESIGNER) || file.getName().equals(UpdateConstants.ASPECTJRT)) {
+                        map.put(file.getAbsolutePath(),
+                                StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file.getName()));
+                    } else {
+                        map.put(file.getAbsolutePath(),
+                                StableUtils.pathJoin(envHome, ProjectConstants.LIB_NAME, file.getName()));
+                    }
+                }
             }
         }
     }
 
-    private void putJarBackupFilesToInstallEnv(String installHome, Map<String, String> map, List<String> list) {
+    private void filesToDelete(String installHome, List<String> list) {
-        String backupDir = UpdateConstants.DESIGNER_BACKUP_DIR;
+        String envHome = WorkContext.getCurrent().getPath();
-        File installEnv = new File(StableUtils.pathJoin(installHome, backupDir, jarRestoreDir, UpdateConstants.BACKUPPATH));
+        File installEnv = new File(StableUtils.pathJoin(envHome,ProjectConstants.LIB_NAME));
         File[] files = installEnv.listFiles();
         if (files != null) {
             for (File file : files) {
-                map.put(file.getAbsolutePath(),
+                if (file.getName().startsWith(UpdateConstants.FINE)) {
-                        StableUtils.pathJoin(WorkContext.getCurrent().getPath(), ProjectConstants.LIB_NAME, file.getName()));
+                    list.add(StableUtils.pathJoin(envHome, ProjectConstants.LIB_NAME, file.getName()));
-                list.add(StableUtils.pathJoin(WorkContext.getCurrent().getPath(), ProjectConstants.LIB_NAME, file.getName()));
+                }
+            }
+        }
+        installEnv = new File(StableUtils.pathJoin(installHome,ProjectConstants.LIB_NAME));
+        files = installEnv.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.getName().startsWith(UpdateConstants.FINE) || file.getName().equals(UpdateConstants.ASPECTJRT)) {
+                    list.add(StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file.getName()));
+                }
             }
         }
     }

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -52,15 +52,16 @@ import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
-import java.util.concurrent.ExecutionException;
 
 import static com.fr.design.layout.TableLayout.FILL;
 import static com.fr.design.layout.TableLayout.PREFERRED;
+import static com.fr.env.TestConnectionResult.AUTH_FAILED;
 import static com.fr.third.guava.base.Optional.fromNullable;
 
 /**
  * @author yaohwu
  */
+@SuppressWarnings("squid:MaximumInheritanceDepth")
 public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
     private static final Color TIPS_FONT_COLOR = new Color(0x8f8f92);
@@ -118,6 +119,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     /**
      * 主机位置
      */
+    @SuppressWarnings("squid:S1948")
     private RemoteWorkspaceURL remoteWorkspaceURL = new RemoteWorkspaceURL("");
     /**
      * https 配置面板
@@ -138,6 +140,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     /**
      * 主机名，web应用，Servlet，端口监听器
      */
+    @SuppressWarnings("squid:S1948")
     private DocumentListener individualDocListener = new DocumentListener() {
 
         @Override
@@ -148,19 +151,32 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
         @Override
         public void insertUpdate(DocumentEvent e) {
-            updateRemoteURL();
+            changedUpdate(e);
-            fillRemoteEnvURLField();
         }
 
         @Override
         public void removeUpdate(DocumentEvent e) {
-            updateRemoteURL();
+            changedUpdate(e);
-            fillRemoteEnvURLField();
+        }
+
+        private void updateRemoteURL() {
+            boolean isHttps = httpsCheckbox.isSelected();
+            String host = hostNameInput.getText();
+            String port = portInput.getText();
+            String web = webAppNameInput.getText();
+            String servlet = servletNameInput.getText();
+            remoteWorkspaceURL.setHttps(isHttps);
+            remoteWorkspaceURL.setHost(host);
+            remoteWorkspaceURL.setPort(port);
+            remoteWorkspaceURL.setWeb(web);
+            remoteWorkspaceURL.setServlet(servlet);
+            remoteWorkspaceURL.resetUrl();
         }
     };
     /**
      * 路径输入框监听器
      */
+    @SuppressWarnings("squid:S1948")
     private DocumentListener overallDocListener = new DocumentListener() {
         @Override
         public void insertUpdate(DocumentEvent e) {
@@ -169,7 +185,6 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
 
         @Override
         public void removeUpdate(DocumentEvent e) {
-
             actionURLInputChange();
         }
 
@@ -177,10 +192,22 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         public void changedUpdate(DocumentEvent e) {
             actionURLInputChange();
         }
+
+        private void actionURLInputChange() {
+            remoteWorkspaceURL = new RemoteWorkspaceURL(remoteEnvURLInput.getText());
+            fillIndividualField();
+
+            httpsCheckbox.setSelected(remoteWorkspaceURL.getHttps());
+            boolean isHttps = httpsCheckbox.isSelected();
+            DesignerEnvManager.getEnvManager().setHttps(isHttps);
+            fileChooserButton.setEnabled(isHttps);
+            updateHttpsConfigPanel();
+        }
     };
     /**
      * https checkbox listener
      */
+    @SuppressWarnings("squid:S1948")
     private ActionListener httpsCheckboxListener = new ActionListener() {
 
         @Override
@@ -523,17 +550,17 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         final RemoteDesignerWorkspaceInfo remoteEnv = updateBean();
         final WorkspaceConnectionInfo connection = remoteEnv.getConnection();
 
-        final SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+        final SwingWorker<TestConnectionResult, Void> worker = new SwingWorker<TestConnectionResult, Void>() {
 
             @Override
-            protected Boolean doInBackground() throws Exception {
+            protected TestConnectionResult doInBackground() throws Exception {
 
                 DesignerEnvManager.getEnvManager().setCertificatePath(connection.getCertPath());
                 DesignerEnvManager.getEnvManager().setCertificatePass(connection.getCertSecretKey());
                 try {
-                    return WorkContext.getConnector().testConnection(connection);
+                    return TestConnectionResult.parse(WorkContext.getConnector().testConnection(connection), connection);
                 } catch (WorkspaceAuthException ignored) {
-                    return null;
+                    return AUTH_FAILED;
                 }
             }
 
@@ -541,14 +568,13 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
             protected void done() {
                 okButton.setEnabled(true);
                 try {
-                    TestConnectionResult result = TestConnectionResult.parse(get(), connection);
+                    TestConnectionResult result = get();
                     message.setText(result.getText());
                     uiLabel.setIcon(result.getIcon());
-                } catch (InterruptedException | ExecutionException e) {
+                } catch (Exception e) {
                     FineLoggerFactory.getLogger().error(e, e.getMessage());
                     message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed"));
                     uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
-                    Thread.currentThread().interrupt();
                 }
                 dialogDownPane.remove(cancelButton);
                 dialogDownPane.revalidate();
@@ -633,36 +659,10 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         enableSubDocListener();
     }
 
-    private void updateRemoteURL() {
-        boolean isHttps = httpsCheckbox.isSelected();
-        String host = hostNameInput.getText();
-        String port = portInput.getText();
-        String web = webAppNameInput.getText();
-        String servlet = servletNameInput.getText();
-        remoteWorkspaceURL.setHttps(isHttps);
-        remoteWorkspaceURL.setHost(host);
-        remoteWorkspaceURL.setPort(port);
-        remoteWorkspaceURL.setWeb(web);
-        remoteWorkspaceURL.setServlet(servlet);
-        remoteWorkspaceURL.resetUrl();
-    }
-
-
     private void updateHttpsConfigPanel() {
         httpsConfigPanel.removeAll();
         packHttpsConfigPanel();
         httpsConfigPanel.revalidate();
         httpsConfigPanel.repaint();
     }
-
-    private void actionURLInputChange() {
-        remoteWorkspaceURL = new RemoteWorkspaceURL(remoteEnvURLInput.getText());
-        fillIndividualField();
-
-        httpsCheckbox.setSelected(remoteWorkspaceURL.getHttps());
-        boolean isHttps = httpsCheckbox.isSelected();
-        DesignerEnvManager.getEnvManager().setHttps(isHttps);
-        fileChooserButton.setEnabled(isHttps);
-        updateHttpsConfigPanel();
-    }
 }

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -33,6 +33,8 @@ import com.fr.file.filter.FILEFilter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.log.FineLoggerFactory;
+import com.fr.report.ExtraReportClassManager;
+import com.fr.report.fun.ReportSupportedFileProvider;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
@@ -480,7 +482,9 @@ public class FILEChooserPane extends BasicPane {
                 Object ss = postfixComboBox.getSelectedItem();
                 if (ss instanceof ChooseFileFilter) {
                     setFILEFilter((ChooseFileFilter) ss);
+                    if (fileNameTextField.isShowing()) {
                         fileNameTextField.setText(calProperFileName(fileNameTextField.getText(), (ChooseFileFilter) ss));
+                    }
                 } else {
                     setFILEFilter(null);
                 }
@@ -740,8 +744,8 @@ public class FILEChooserPane extends BasicPane {
 
             if (type == JFileChooser.OPEN_DIALOG) {
                 ChooseFileFilter supportedTypes = new ChooseFileFilter(FRContext.getFileNodes().getSupportedTypes(), appName + Toolkit.i18nText("Fine-Design_Report_Template_File"));
-                Set<ReportSupportedFileUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ReportSupportedFileUIProvider.XML_TAG);
+                Set<ReportSupportedFileProvider> providers = ExtraReportClassManager.getInstance().getArray(ReportSupportedFileProvider.XML_TAG);
-                for (ReportSupportedFileUIProvider provider : providers) {
+                for (ReportSupportedFileProvider provider : providers) {
                     for (FileExtension fileExtension : provider.getFileExtensions()){
                         supportedTypes.addExtension(fileExtension.getExtension());
                     }

designer-base/src/test/java/com/fr/design/gui/itree/filetree/FileNodeConstantsTest.java

@@ -1,9 +1,9 @@
 package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.extension.FileExtension;
-import com.fr.design.ExtraDesignClassManager;
+import com.fr.report.ExtraReportClassManager;
-import com.fr.design.fun.ReportSupportedFileUIProvider;
+import com.fr.report.fun.ReportSupportedFileProvider;
-import com.fr.design.fun.impl.AbstractReportSupportedFileUIProvider;
+import com.fr.report.fun.impl.AbstractReportSupportedFileProvider;
 import com.fr.stable.fun.mark.Mutable;
 import org.easymock.EasyMock;
 import org.junit.Assert;
@@ -19,38 +19,38 @@ import java.util.Set;
  * Created by alex sung on 2019/7/25.
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(ExtraDesignClassManager.class)
+@PrepareForTest(ExtraReportClassManager.class)
 public class FileNodeConstantsTest {
     @Test
     public void supportFileTypesTest() {
-        ExtraDesignClassManager extra = mockExtraDesignClassManager();
+        ExtraReportClassManager extra = mockExtraReportClassManager();
-        Assert.assertEquals(1, extra.getArray(ReportSupportedFileUIProvider.XML_TAG).size());
+        Assert.assertEquals(1, extra.getArray(ReportSupportedFileProvider.XML_TAG).size());
-        ReportSupportedFileUIProvider option = (ReportSupportedFileUIProvider) extra.getArray(ReportSupportedFileUIProvider.XML_TAG).iterator().next();
+        ReportSupportedFileProvider option = (ReportSupportedFileProvider) extra.getArray(ReportSupportedFileProvider.XML_TAG).iterator().next();
         Assert.assertEquals(FileExtension.CPTX, option.getFileExtensions()[0]);
     }
 
     @Test
     public void testSupportFileTypesOrder() {
-        ExtraDesignClassManager extra = mockExtraDesignClassManager();
+        ExtraReportClassManager extra = mockExtraReportClassManager();
-        PowerMock.mockStatic(ExtraDesignClassManager.class);
+        PowerMock.mockStatic(ExtraReportClassManager.class);
-        EasyMock.expect(ExtraDesignClassManager.getInstance()).andReturn(extra).once();
+        EasyMock.expect(ExtraReportClassManager.getInstance()).andReturn(extra).once();
         PowerMock.replayAll();
         String[] fileTypes = FileNodeConstants.getSupportFileTypes();
         Assert.assertEquals("cptx", fileTypes[0]);
         Assert.assertEquals("cpt", fileTypes[1]);
     }
 
-    private ExtraDesignClassManager mockExtraDesignClassManager() {
+    private ExtraReportClassManager mockExtraReportClassManager() {
-        ExtraDesignClassManager extra = EasyMock.mock(ExtraDesignClassManager.class);
+        ExtraReportClassManager extra = EasyMock.mock(ExtraReportClassManager.class);
         Set<Mutable> options = new HashSet<Mutable>() {{
             add(new MockNewTemplateFileOption());
         }};
-        EasyMock.expect(extra.getArray(ReportSupportedFileUIProvider.XML_TAG)).andReturn(options).anyTimes();
+        EasyMock.expect(extra.getArray(ReportSupportedFileProvider.XML_TAG)).andReturn(options).anyTimes();
         EasyMock.replay(extra);
         return extra;
     }
 
-    private class MockNewTemplateFileOption extends AbstractReportSupportedFileUIProvider {
+    private class MockNewTemplateFileOption extends AbstractReportSupportedFileProvider {
 
         @Override
         public FileExtension[] getFileExtensions() {

designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java

@@ -110,7 +110,10 @@ public class CellWidgetPropertyPane extends BasicPane {
             if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去
                 tplEC.addCellElement(cellElement);
             } else {
-                cellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
+                TemplateCellElement newCellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
+                if (newCellElement != null) {
+                    cellElement = newCellElement;
+                }
             }
             setCellWidget(cellWidget, cellElement);
         } else {

designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

@@ -69,6 +69,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Row_Form")));
         repeatTitleRowPane = new RepeatRowPane();
         soverlapRowStartPane.add(repeatTitleRowPane);
+        soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row")));
 
         return soverlapRowStartPane;
     }
@@ -85,6 +86,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         // 重复打印标题的结束列
         repeatTitleColPane = new RepeatColPane();
         soverlapColStartPane.add(repeatTitleColPane);
+        soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column")));
 
         return soverlapColStartPane;
     }
@@ -100,6 +102,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Row_Form")));
         repeatFinisRowPane = new RepeatRowPane();
         foverlapRowStartPane.add(repeatFinisRowPane);
+        foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row")));
 
         return foverlapRowStartPane;
     }
@@ -115,6 +118,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Column_Form")));
         repeatFinisColPane = new RepeatColPane();
         foverlapColStartPane.add(repeatFinisColPane);
+        foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column")));
 
         return foverlapColStartPane;
     }

designer-realize/src/main/java/com/fr/design/webattr/EventPane.java

@@ -168,7 +168,7 @@ public class EventPane extends BasicPane {
 				return;
 			}
 
-			int val = JOptionPane.showConfirmDialog(EventPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?", "Message",
+			int val = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EventPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?", "Message",
 					JOptionPane.YES_NO_OPTION);
 			if (val != JOptionPane.YES_OPTION) {
 				return;