fanruan
/
design
6
0
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

REPORT-46916 调整包名，兼容性调整

research/11.0
loy 3 years ago
parent
ba5fe94b43
commit
25d713bae2
46 changed files with 109 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      designer-base/src/main/java/com/fr/design/actions/file/BatchCompileAction.java
  2. 2
      designer-base/src/main/java/com/fr/design/actions/server/LocalAnalyzerAction.java
  3. 4
      designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java
  4. 4
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  5. 5
      designer-base/src/main/java/com/fr/nx/app/designer/cptx/io/DesignReadWritableProvider.java
  6. 4
      designer-base/src/main/java/com/fr/nx/app/designer/monitor/DesignerMetricRecorder.java
  7. 6
      designer-base/src/main/java/com/fr/nx/app/designer/toolbar/CompileAction.java
  8. 6
      designer-base/src/main/java/com/fr/nx/app/designer/toolbar/TemplateTransformer.java
  9. 2
      designer-base/src/main/java/com/fr/nx/app/designer/toolbar/TransformResult.java
  10. 2
      designer-base/src/main/java/com/fr/nx/app/designer/toolbar/TransformResultInfo.java
  11. 2
      designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformProgress.java
  12. 2
      designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformUtil.java
  13. 6
      designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformer.java
  14. 2
      designer-base/src/main/java/com/fr/nx/app/designer/transform/UpdateCallBack.java
  15. 2
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/BatchTransformDialog.java
  16. 4
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/BatchTransformPane.java
  17. 4
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/PrepareTransformFileList.java
  18. 4
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/TransformFileTree.java
  19. 8
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/TransformPreparePane.java
  20. 10
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/TransformResultList.java
  21. 6
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/TransformResultPane.java
  22. 2
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/UIListControlCellRenderer.java
  23. 4
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/UpdateProgressDialog.java
  24. 6
      designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/UpdateProgressPane.java
  25. 8
      designer-base/src/main/java/com/fr/nx/app/designer/utils/CompileTransformUtil.java
  26. 6
      designer-base/src/main/java/com/fr/nx/app/designer/utils/DesignerCptxFileUtils.java
  27. 7
      designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TemplateTransformerDebugTest.java
  28. 8
      designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TemplateTransformerTest.java
  29. 2
      designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TransformResultInfoTest.java
  30. 2
      designer-base/src/test/java/com/fr/nx/app/designer/transform/BatchTransformProgressTest.java
  31. 2
      designer-base/src/test/java/com/fr/nx/app/designer/transform/BatchTransformUtilTest.java
  32. 2
      designer-base/src/test/java/com/fr/nx/app/designer/transform/BatchTransformerTest.java
  33. 4
      designer-base/src/test/java/com/fr/nx/app/designer/utils/CompileTransformUtilTest.java
  34. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppActivator.java
  35. 20
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandExtraAttrPane.java
  36. 4
      designer-realize/src/main/java/com/fr/nx/app/designer/CptxApp.java
  37. 12
      designer-realize/src/main/java/com/fr/nx/app/designer/JStreamBook.java
  38. 2
      designer-realize/src/main/java/com/fr/nx/app/designer/StartupAssist.java
  39. 2
      designer-realize/src/main/java/com/fr/nx/app/designer/cell/CellTreeAttrPanel.java
  40. 4
      designer-realize/src/main/java/com/fr/nx/app/designer/cell/CellTreeAttrPanelProvider.java
  41. 4
      designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrAction.java
  42. 4
      designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrPane.java
  43. 4
      designer-realize/src/main/java/com/fr/nx/app/designer/menu/FeatureFlagsPanel.java
  44. 2
      designer-realize/src/main/java/com/fr/nx/app/designer/menu/bean/FeatureFlagBean.java
  45. 4
      designer-realize/src/test/java/com/fr/nx/app/designer/CptxAppTest.java
  46. 8
      designer-realize/src/test/java/com/fr/nx/app/designer/JStreamBookTest.java

4
designer-base/src/main/java/com/fr/design/actions/file/BatchCompileAction.java
Unescape View File

@ -4,7 +4,7 @@ import com.fr.base.BaseUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet;
import com.fr.locale.InterProviderFactory;
import com.fr.plugin.designer.transform.ui.BatchTransformPane;
import com.fr.nx.app.designer.transform.ui.BatchTransformPane;
import javax.swing.KeyStroke;
import java.awt.Dialog;
@ -18,7 +18,7 @@ public class BatchCompileAction extends UpdateAction {
this.setMenuKeySet(COMPILE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/plugin/designer/transform/batch_transform.png"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/nx/app/designer/transform/batch_transform.png"));
}
@Override

2
designer-base/src/main/java/com/fr/design/actions/server/LocalAnalyzerAction.java
Unescape View File

@ -21,7 +21,7 @@ public class LocalAnalyzerAction extends UpdateAction {
this.setMenuKeySet(ANALYZER);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/plugin/designer/transform/analyzer.png"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/nx/app/designer/transform/analyzer.png"));
}
@Override

4
designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java
Unescape View File

@ -48,8 +48,8 @@ public class FileTreeIcon {
public static final Icon MODERN_CHT_FILE_IMAGE_ICON =
BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png");
public static final Icon CPTX_ICON = BaseUtils.readIcon("/com/fr/plugin/designer/cptx_file_icon.png");
public static final Icon CPTX_LOCKED_ICON = BaseUtils.readIcon("/com/fr/plugin/designer/cptx_file_icon_locked.png");
public static final Icon CPTX_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/cptx_file_icon.png");
public static final Icon CPTX_LOCKED_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/cptx_file_icon_locked.png");
public static final LockIcon FOLDER_LOCK_ICON =
new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/fold.png"));

4
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
Unescape View File

@ -62,8 +62,8 @@ import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.context.PluginContext;
import com.fr.plugin.context.PluginRuntime;
import com.fr.plugin.designer.toolbar.CompileAction;
import com.fr.plugin.designer.toolbar.TemplateTransformer;
import com.fr.nx.app.designer.toolbar.CompileAction;
import com.fr.nx.app.designer.toolbar.TemplateTransformer;
import com.fr.plugin.injectable.PluginModule;
import com.fr.plugin.manage.PluginFilter;
import com.fr.plugin.observer.PluginEvent;

5
designer-base/src/main/java/com/fr/plugin/designer/cptx/io/DesignReadWritableProvider.java → designer-base/src/main/java/com/fr/nx/app/designer/cptx/io/DesignReadWritableProvider.java
Unescape View File

@ -1,12 +1,11 @@
package com.fr.plugin.designer.cptx.io;
package com.fr.nx.app.designer.cptx.io;
import com.fr.common.annotations.Negative;
import com.fr.file.FILE;
import com.fr.nx.app.designer.utils.DesignerCptxFileUtils;
import com.fr.nx.cptx.io.handle.impl.AbstractCptxIOProvider;
import com.fr.nx.cptx.pack.util.CompiledReportInputStream;
import com.fr.nx.cptx.pack.util.CompiledReportOutputStream;
import com.fr.nx.cptx.utils.CptxFileUtils;
import com.fr.plugin.designer.utils.DesignerCptxFileUtils;
import java.io.IOException;
import java.io.InputStream;

4
designer-base/src/main/java/com/fr/plugin/designer/monitor/DesignerMetricRecorder.java → designer-base/src/main/java/com/fr/nx/app/designer/monitor/DesignerMetricRecorder.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.monitor;
package com.fr.nx.app.designer.monitor;
import com.fr.design.mainframe.errorinfo.ErrorInfo;
import com.fr.intelli.record.MetricRegistry;
@ -6,7 +6,7 @@ import com.fr.json.JSON;
import com.fr.json.JSONFactory;
import com.fr.json.JSONObject;
import com.fr.message.ErrorMessage;
import com.fr.plugin.designer.toolbar.TransformResult;
import com.fr.nx.app.designer.toolbar.TransformResult;
/**
* Created by loy on 2021/1/18.

6
designer-base/src/main/java/com/fr/plugin/designer/toolbar/CompileAction.java → designer-base/src/main/java/com/fr/nx/app/designer/toolbar/CompileAction.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.toolbar;
package com.fr.nx.app.designer.toolbar;
import com.fr.base.extension.FileExtension;
import com.fr.design.actions.UpdateAction;
@ -11,7 +11,7 @@ import com.fr.file.FILE;
import com.fr.file.FileNodeFILE;
import com.fr.general.IOUtils;
import com.fr.locale.InterProviderFactory;
import com.fr.plugin.designer.utils.CompileTransformUtil;
import com.fr.nx.app.designer.utils.CompileTransformUtil;
import javax.swing.Icon;
import javax.swing.JComponent;
@ -29,7 +29,7 @@ import static javax.swing.JOptionPane.WARNING_MESSAGE;
* Created by kerry on 2019-10-14
*/
public class CompileAction extends UpdateAction {
public static final Icon TRANS_ICON = IOUtils.readIcon("/com/fr/plugin/designer/transform.png");
public static final Icon TRANS_ICON = IOUtils.readIcon("/com/fr/nx/app/designer/transform.png");
private static final MenuKeySet COMPILE_ATTR = new MenuKeySet() {
@Override

6
designer-base/src/main/java/com/fr/plugin/designer/toolbar/TemplateTransformer.java → designer-base/src/main/java/com/fr/nx/app/designer/toolbar/TemplateTransformer.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.toolbar;
package com.fr.nx.app.designer.toolbar;
import com.fr.base.extension.FileExtension;
import com.fr.design.file.HistoryTemplateListCache;
@ -11,6 +11,7 @@ import com.fr.file.filetree.FileNode;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.main.impl.WorkBook;
import com.fr.nx.app.designer.monitor.DesignerMetricRecorder;
import com.fr.nx.compile.CompileStatus;
import com.fr.nx.compile.ReportCompiler;
import com.fr.nx.compile.adapter.LegacyWorkBookAdapter;
@ -19,13 +20,12 @@ import com.fr.nx.cptx.CptxIOManager;
import com.fr.nx.cptx.cache.CptxTemplatePool;
import com.fr.nx.cptx.entry.CptxTemplate;
import com.fr.nx.cptx.io.handle.CptxTemplateHandle;
import com.fr.plugin.designer.cptx.io.DesignReadWritableProvider;
import com.fr.nx.app.designer.cptx.io.DesignReadWritableProvider;
import com.fr.nx.cptx.monitor.CompileMonitorHandler;
import com.fr.nx.cptx.utils.CptxFileUtils;
import com.fr.nx.data.layer.LayerItem;
import com.fr.nx.data.layer.LayerProps;
import com.fr.nx.template.compile.CompiledReport;
import com.fr.plugin.designer.monitor.DesignerMetricRecorder;
import com.fr.stable.StringUtils;
import org.jetbrains.annotations.NotNull;

2
designer-base/src/main/java/com/fr/plugin/designer/toolbar/TransformResult.java → designer-base/src/main/java/com/fr/nx/app/designer/toolbar/TransformResult.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.toolbar;
package com.fr.nx.app.designer.toolbar;
import com.fr.design.file.TemplateTreePane;
import com.fr.design.mainframe.DesignerContext;

2
designer-base/src/main/java/com/fr/plugin/designer/toolbar/TransformResultInfo.java → designer-base/src/main/java/com/fr/nx/app/designer/toolbar/TransformResultInfo.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.toolbar;
package com.fr.nx.app.designer.toolbar;
import com.fr.locale.InterProviderFactory;
import com.fr.stable.StringUtils;

2
designer-base/src/main/java/com/fr/plugin/designer/transform/BatchTransformProgress.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformProgress.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform;
package com.fr.nx.app.designer.transform;
/**
* Created by kerry on 2019-12-10

2
designer-base/src/main/java/com/fr/plugin/designer/transform/BatchTransformUtil.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformUtil.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform;
package com.fr.nx.app.designer.transform;
import com.fr.file.filetree.FileNode;

6
designer-base/src/main/java/com/fr/plugin/designer/transform/BatchTransformer.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/BatchTransformer.java
Unescape View File

@ -1,10 +1,10 @@
package com.fr.plugin.designer.transform;
package com.fr.nx.app.designer.transform;
import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
import com.fr.file.filetree.FileNode;
import com.fr.plugin.context.PluginContexts;
import com.fr.plugin.designer.toolbar.TransformResultInfo;
import com.fr.plugin.designer.utils.CompileTransformUtil;
import com.fr.nx.app.designer.toolbar.TransformResultInfo;
import com.fr.nx.app.designer.utils.CompileTransformUtil;
import java.util.List;
import java.util.Map;

2
designer-base/src/main/java/com/fr/plugin/designer/transform/UpdateCallBack.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/UpdateCallBack.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform;
package com.fr.nx.app.designer.transform;
/**
* Created by kerry on 2019-12-10

2
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/BatchTransformDialog.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/BatchTransformDialog.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.layout.FRGUIPaneFactory;

4
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/BatchTransformPane.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/BatchTransformPane.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.base.extension.FileExtension;
import com.fr.design.dialog.BasicPane;
@ -17,7 +17,7 @@ import com.fr.file.filetree.FileNode;
import com.fr.file.filetree.IOFileNodeFilter;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import com.fr.plugin.designer.toolbar.TransformResultInfo;
import com.fr.nx.app.designer.toolbar.TransformResultInfo;
import javax.swing.BorderFactory;
import javax.swing.JPanel;

4
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/PrepareTransformFileList.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/PrepareTransformFileList.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
@ -42,7 +42,7 @@ public class PrepareTransformFileList extends UIList {
@Override
protected Icon getRightLabelIcon(Object value) {
return BaseUtils.readIcon("/com/fr/plugin/designer/transform/tab_close.png");
return BaseUtils.readIcon("/com/fr/nx/app/designer/transform/tab_close.png");
}
});
this.addMouseListener(getListMouseListener());

4
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/TransformFileTree.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/TransformFileTree.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.base.FRContext;
import com.fr.base.extension.FileExtension;
@ -9,7 +9,7 @@ import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.remote.ui.tree.FileAuthorityTree;
import com.fr.file.filetree.FileNode;
import com.fr.general.ComparatorUtils;
import com.fr.plugin.designer.transform.BatchTransformUtil;
import com.fr.nx.app.designer.transform.BatchTransformUtil;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeCellRenderer;

8
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/TransformPreparePane.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/TransformPreparePane.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane;
@ -6,9 +6,9 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.file.filetree.FileNode;
import com.fr.locale.InterProviderFactory;
import com.fr.plugin.designer.toolbar.TransformResultInfo;
import com.fr.plugin.designer.transform.BatchTransformer;
import com.fr.plugin.designer.transform.UpdateCallBack;
import com.fr.nx.app.designer.toolbar.TransformResultInfo;
import com.fr.nx.app.designer.transform.BatchTransformer;
import com.fr.nx.app.designer.transform.UpdateCallBack;
import javax.swing.BorderFactory;
import javax.swing.Box;

10
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/TransformResultList.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/TransformResultList.java
Unescape View File

@ -1,11 +1,11 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ilist.UIList;
import com.fr.design.gui.itree.filetree.FileTreeIcon;
import com.fr.file.filetree.FileNode;
import com.fr.plugin.designer.toolbar.TransformResultInfo;
import com.fr.nx.app.designer.toolbar.TransformResultInfo;
import javax.swing.DefaultListModel;
import javax.swing.Icon;
@ -18,9 +18,9 @@ import java.util.Map;
*/
public class TransformResultList extends UIList {
private Map<FileNode, TransformResultInfo> resultMap;
private static final Icon FAILED_ICON = BaseUtils.readIcon("/com/fr/plugin/designer/transform/transform_failed.png");
private static final Icon SUCCESS_ICON = BaseUtils.readIcon("/com/fr/plugin/designer/transform/transform_success.png");
private static final Icon UNSUPPORT_ICON = BaseUtils.readIcon("/com/fr/plugin/designer/transform/transform_unsupport.png");
private static final Icon FAILED_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/transform/transform_failed.png");
private static final Icon SUCCESS_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/transform/transform_success.png");
private static final Icon UNSUPPORT_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/transform/transform_unsupport.png");
public TransformResultList() {
super();

6
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/TransformResultPane.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/TransformResultPane.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
@ -7,8 +7,8 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.file.filetree.FileNode;
import com.fr.general.ComparatorUtils;
import com.fr.locale.InterProviderFactory;
import com.fr.plugin.designer.toolbar.TransformResult;
import com.fr.plugin.designer.toolbar.TransformResultInfo;
import com.fr.nx.app.designer.toolbar.TransformResult;
import com.fr.nx.app.designer.toolbar.TransformResultInfo;
import javax.swing.BorderFactory;
import javax.swing.JPanel;

2
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/UIListControlCellRenderer.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/UIListControlCellRenderer.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;

4
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/UpdateProgressDialog.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/UpdateProgressDialog.java
Unescape View File

@ -1,10 +1,10 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.locale.InterProviderFactory;
import com.fr.plugin.designer.transform.BatchTransformer;
import com.fr.nx.app.designer.transform.BatchTransformer;
import javax.swing.JDialog;
import javax.swing.JPanel;

6
designer-base/src/main/java/com/fr/plugin/designer/transform/ui/UpdateProgressPane.java → designer-base/src/main/java/com/fr/nx/app/designer/transform/ui/UpdateProgressPane.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform.ui;
package com.fr.nx.app.designer.transform.ui;
import com.fr.base.BaseUtils;
@ -8,7 +8,7 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.ComparatorUtils;
import com.fr.locale.InterProviderFactory;
import com.fr.plugin.designer.transform.UpdateCallBack;
import com.fr.nx.app.designer.transform.UpdateCallBack;
import com.sun.java.swing.plaf.motif.MotifProgressBarUI;
import javax.swing.BorderFactory;
@ -32,7 +32,7 @@ public class UpdateProgressPane extends BasicPane implements UpdateCallBack {
private void initPane() {
this.setPreferredSize(new Dimension(262, 60));
UILabel icon = new UILabel(BaseUtils.readIcon("/com/fr/plugin/designer/transform/transforming.png"));
UILabel icon = new UILabel(BaseUtils.readIcon("/com/fr/nx/app/designer/transform/transforming.png"));
icon.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
this.add(icon, BorderLayout.WEST);
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();

8
designer-base/src/main/java/com/fr/plugin/designer/utils/CompileTransformUtil.java → designer-base/src/main/java/com/fr/nx/app/designer/utils/CompileTransformUtil.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.utils;
package com.fr.nx.app.designer.utils;
import com.fr.design.mainframe.JTemplate;
import com.fr.file.FILE;
@ -6,9 +6,9 @@ import com.fr.file.filetree.FileNode;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.main.impl.WorkBook;
import com.fr.plugin.designer.toolbar.TemplateTransformer;
import com.fr.plugin.designer.toolbar.TransformResult;
import com.fr.plugin.designer.toolbar.TransformResultInfo;
import com.fr.nx.app.designer.toolbar.TemplateTransformer;
import com.fr.nx.app.designer.toolbar.TransformResult;
import com.fr.nx.app.designer.toolbar.TransformResultInfo;
import com.fr.workspace.WorkContext;
import java.io.InputStream;

6
designer-base/src/main/java/com/fr/plugin/designer/utils/DesignerCptxFileUtils.java → designer-base/src/main/java/com/fr/nx/app/designer/utils/DesignerCptxFileUtils.java
Unescape View File

@ -1,11 +1,11 @@
package com.fr.plugin.designer.utils;
package com.fr.nx.app.designer.utils;
import com.fr.file.FILE;
import com.fr.general.CommonIOUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.main.impl.WorkBook;
import com.fr.marshal.impl.xml.DefaultXMLObjectUnmarshaler;
import com.fr.marshal.util.MarshalUtil;
import com.fr.nx.marshal.impl.xml.DefaultXMLObjectUnmarshaler;
import com.fr.nx.marshal.util.MarshalUtil;
import com.fr.nx.cptx.entry.metadata.CptxMetadata;
import com.fr.nx.cptx.io.handle.impl.OriginCptProvider;
import com.fr.nx.cptx.marshal.util.CptxMarshalUtil;

7
designer-base/src/test/java/com/fr/plugin/designer/toolbar/TemplateTransformerDebugTest.java → designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TemplateTransformerDebugTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.toolbar;
package com.fr.nx.app.designer.toolbar;
import com.fr.base.Parameter;
import com.fr.base.chart.BaseChartCollection;
@ -20,6 +20,7 @@ import com.fr.form.main.FormHyperlink;
import com.fr.form.main.parameter.FormParameterUI;
import com.fr.form.parameter.FormSubmitButton;
import com.fr.form.plugin.DefaultSwitcherImpl;
import com.fr.general.xml.GeneralXMLTools;
import com.fr.io.EncryptUtils;
import com.fr.js.FormHyperlinkProvider;
import com.fr.main.impl.WorkBook;
@ -119,8 +120,8 @@ public class TemplateTransformerDebugTest {
StableFactory.registerXMLDescription(BaseChartCollection.XML_TAG, new ChartCollection());
StableFactory.registerXMLDescription(Parameter.XML_TAG, new Parameter());
FineRuntime.start();
EssentialUtils.registerObjectTokenizer(new ReportXMLUtils.ReportObjectTokenizer());
EssentialUtils.registerObjectXMLWriterFinder(new ReportXMLUtils.ReportObjectXMLWriterFinder());
GeneralXMLTools.Object_Tokenizer = new ReportXMLUtils.ReportObjectTokenizer();
GeneralXMLTools.Object_XML_Writer_Finder = new ReportXMLUtils.ReportObjectXMLWriterFinder();
DaoContext.setEntityDao(new LocalEntityDao());
DaoContext.setClassHelperDao(new LocalClassHelperDao());
DaoContext.setXmlEntityDao(new LocalXmlEntityDao());

8
designer-base/src/test/java/com/fr/plugin/designer/toolbar/TemplateTransformerTest.java → designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TemplateTransformerTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.toolbar;
package com.fr.nx.app.designer.toolbar;
import com.fr.base.FRContext;
import com.fr.base.operator.common.CommonOperator;
@ -14,9 +14,9 @@ import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import static com.fr.plugin.designer.toolbar.TemplateTransformer.OTHER;
import static com.fr.plugin.designer.toolbar.TemplateTransformer.TO_CPT;
import static com.fr.plugin.designer.toolbar.TemplateTransformer.TO_CPTX;
import static com.fr.nx.app.designer.toolbar.TemplateTransformer.OTHER;
import static com.fr.nx.app.designer.toolbar.TemplateTransformer.TO_CPT;
import static com.fr.nx.app.designer.toolbar.TemplateTransformer.TO_CPTX;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;

2
designer-base/src/test/java/com/fr/plugin/designer/toolbar/TransformResultInfoTest.java → designer-base/src/test/java/com/fr/nx/app/designer/toolbar/TransformResultInfoTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.toolbar;
package com.fr.nx.app.designer.toolbar;
import com.fr.locale.InterProviderFactory;
import org.junit.Assert;

2
designer-base/src/test/java/com/fr/plugin/designer/transform/BatchTransformProgressTest.java → designer-base/src/test/java/com/fr/nx/app/designer/transform/BatchTransformProgressTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform;
package com.fr.nx.app.designer.transform;
import org.junit.Assert;
import org.junit.Test;

2
designer-base/src/test/java/com/fr/plugin/designer/transform/BatchTransformUtilTest.java → designer-base/src/test/java/com/fr/nx/app/designer/transform/BatchTransformUtilTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform;
package com.fr.nx.app.designer.transform;
import com.fr.file.filetree.FileNode;
import org.junit.Assert;

2
designer-base/src/test/java/com/fr/plugin/designer/transform/BatchTransformerTest.java → designer-base/src/test/java/com/fr/nx/app/designer/transform/BatchTransformerTest.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.transform;
package com.fr.nx.app.designer.transform;
import org.junit.Before;
import org.junit.Test;

4
designer-base/src/test/java/com/fr/plugin/designer/utils/CompileTransformUtilTest.java → designer-base/src/test/java/com/fr/nx/app/designer/utils/CompileTransformUtilTest.java
Unescape View File

@ -1,11 +1,11 @@
package com.fr.plugin.designer.utils;
package com.fr.nx.app.designer.utils;
import com.fr.base.FRContext;
import com.fr.base.operator.common.CommonOperator;
import com.fr.design.mainframe.JTemplate;
import com.fr.file.FILE;
import com.fr.file.filetree.FileNodes;
import com.fr.plugin.designer.toolbar.TemplateTransformer;
import com.fr.nx.app.designer.toolbar.TemplateTransformer;
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;

2
designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppActivator.java
Unescape View File

@ -4,7 +4,7 @@ import com.fr.design.mainframe.App;
import com.fr.design.mainframe.JTemplateFactory;
import com.fr.module.Activator;
import com.fr.module.extension.Prepare;
import com.fr.plugin.designer.CptxApp;
import com.fr.nx.app.designer.CptxApp;
import java.util.List;

20
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandExtraAttrPane.java
Unescape View File

@ -7,6 +7,7 @@ import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.ui.util.UIUtil;
import com.fr.event.EventDispatcher;
import com.fr.nx.app.designer.cell.CellTreeAttrPanelProvider;
import com.fr.plugin.context.PluginContext;
import com.fr.plugin.injectable.PluginModule;
import com.fr.plugin.manage.PluginFilter;
@ -19,7 +20,10 @@ import java.awt.BorderLayout;
import java.awt.Component;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import static com.fr.plugin.observer.PluginEventType.AfterRun;
@ -114,14 +118,14 @@ public class CellExpandExtraAttrPane extends JPanel {
extras = new ArrayList<>();
}
extras.clear();
Set<CellExpandAttrPanelProvider> attrProviders = ExtraDesignClassManager.getInstance().getArray(CellExpandAttrPanelProvider.MARK_STRING);
if (attrProviders != null) {
for (CellExpandAttrPanelProvider attrProvider : attrProviders) {
if (attrProvider.isDisplayable()) {
BasicBeanPane<TemplateCellElement> extra = attrProvider.createPanel();
if (extra != null) {
extras.add(extra);
}
Set<CellExpandAttrPanelProvider> attrProviders = new LinkedHashSet<>(Collections.singletonList(new CellTreeAttrPanelProvider()));
Optional.<Set<CellExpandAttrPanelProvider>>of(ExtraDesignClassManager.getInstance().getArray(CellExpandAttrPanelProvider.MARK_STRING))
.ifPresent(attrProviders::addAll);
for (CellExpandAttrPanelProvider attrProvider : attrProviders) {
if (attrProvider.isDisplayable()) {
BasicBeanPane<TemplateCellElement> extra = attrProvider.createPanel();
if (extra != null) {
extras.add(extra);
}
}
}

4
designer-realize/src/main/java/com/fr/plugin/designer/CptxApp.java → designer-realize/src/main/java/com/fr/nx/app/designer/CptxApp.java
Unescape View File

@ -1,11 +1,11 @@
package com.fr.plugin.designer;
package com.fr.nx.app.designer;
import com.fr.base.extension.FileExtension;
import com.fr.design.mainframe.AbstractAppProvider;
import com.fr.design.mainframe.JTemplate;
import com.fr.file.FILE;
import com.fr.main.impl.WorkBook;
import com.fr.plugin.designer.utils.DesignerCptxFileUtils;
import com.fr.nx.app.designer.utils.DesignerCptxFileUtils;
/**
* 支持设计器打开cptx文件

12
designer-realize/src/main/java/com/fr/plugin/designer/JStreamBook.java → designer-realize/src/main/java/com/fr/nx/app/designer/JStreamBook.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer;
package com.fr.nx.app.designer;
import com.fr.base.extension.FileExtension;
import com.fr.design.actions.file.export.CSVExportAction;
@ -14,12 +14,12 @@ import com.fr.general.ComparatorUtils;
import com.fr.locale.InterProviderFactory;
import com.fr.log.FineLoggerFactory;
import com.fr.main.impl.WorkBook;
import com.fr.nx.app.designer.utils.DesignerCptxFileUtils;
import com.fr.nx.cptx.entry.metadata.CptxMetadata;
import com.fr.plugin.designer.menu.CalculateAttrAction;
import com.fr.plugin.designer.toolbar.TemplateTransformer;
import com.fr.plugin.designer.toolbar.TransformResult;
import com.fr.plugin.designer.toolbar.TransformResultInfo;
import com.fr.plugin.designer.utils.DesignerCptxFileUtils;
import com.fr.nx.app.designer.menu.CalculateAttrAction;
import com.fr.nx.app.designer.toolbar.TemplateTransformer;
import com.fr.nx.app.designer.toolbar.TransformResult;
import com.fr.nx.app.designer.toolbar.TransformResultInfo;
import com.fr.stable.StringUtils;
import com.fr.stable.project.ProjectConstants;
import com.fr.third.jodd.util.ArraysUtil;

2
designer-realize/src/main/java/com/fr/plugin/designer/StartupAssist.java → designer-realize/src/main/java/com/fr/nx/app/designer/StartupAssist.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer;
package com.fr.nx.app.designer;
import com.fr.base.Parameter;
import com.fr.base.extension.FileExtension;

2
designer-base/src/main/java/com/fr/plugin/designer/cell/CellTreeAttrPanel.java → designer-realize/src/main/java/com/fr/nx/app/designer/cell/CellTreeAttrPanel.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.cell;
package com.fr.nx.app.designer.cell;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.event.UIObserverListener;

4
designer-base/src/main/java/com/fr/plugin/designer/cell/CellTreeAttrPanelProvider.java → designer-realize/src/main/java/com/fr/nx/app/designer/cell/CellTreeAttrPanelProvider.java
Unescape View File

@ -1,10 +1,10 @@
package com.fr.plugin.designer.cell;
package com.fr.nx.app.designer.cell;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.fun.impl.AbstractCellExpandAttrPanelProvider;
import com.fr.design.mainframe.JTemplate;
import com.fr.plugin.designer.JStreamBook;
import com.fr.nx.app.designer.JStreamBook;
import com.fr.report.cell.TemplateCellElement;
/**

4
designer-realize/src/main/java/com/fr/plugin/designer/menu/CalculateAttrAction.java → designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrAction.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.menu;
package com.fr.nx.app.designer.menu;
import com.fr.base.BaseUtils;
import com.fr.design.actions.JTemplateAction;
@ -9,8 +9,8 @@ import com.fr.design.mainframe.DesignerContext;
import com.fr.design.menu.MenuKeySet;
import com.fr.locale.InterProviderFactory;
import com.fr.main.impl.WorkBook;
import com.fr.nx.app.designer.JStreamBook;
import com.fr.plugin.attr.CalculatorAttrMark;
import com.fr.plugin.designer.JStreamBook;
import javax.swing.KeyStroke;
import java.awt.event.ActionEvent;

4
designer-realize/src/main/java/com/fr/plugin/designer/menu/CalculateAttrPane.java → designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrPane.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.menu;
package com.fr.nx.app.designer.menu;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.DialogActionAdapter;
@ -9,10 +9,10 @@ import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.locale.InterProviderFactory;
import com.fr.nx.app.designer.menu.bean.FeatureFlagBean;
import com.fr.nx.feature.FeatureFlags;
import com.fr.nx.feature.FeatureManager;
import com.fr.plugin.attr.CalculatorAttrMark;
import com.fr.plugin.designer.menu.bean.FeatureFlagBean;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;

4
designer-realize/src/main/java/com/fr/plugin/designer/menu/FeatureFlagsPanel.java → designer-realize/src/main/java/com/fr/nx/app/designer/menu/FeatureFlagsPanel.java
Unescape View File

@ -1,12 +1,12 @@
package com.fr.plugin.designer.menu;
package com.fr.nx.app.designer.menu;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.locale.InterProviderFactory;
import com.fr.nx.app.designer.menu.bean.FeatureFlagBean;
import com.fr.nx.feature.FeatureFlag;
import com.fr.plugin.designer.menu.bean.FeatureFlagBean;
import com.fr.stable.collections.combination.Pair;
import javax.swing.BorderFactory;

2
designer-realize/src/main/java/com/fr/plugin/designer/menu/bean/FeatureFlagBean.java → designer-realize/src/main/java/com/fr/nx/app/designer/menu/bean/FeatureFlagBean.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.plugin.designer.menu.bean;
package com.fr.nx.app.designer.menu.bean;
import com.fr.nx.feature.FeatureFlag;
import com.fr.nx.feature.FeatureManager;

4
designer-realize/src/test/java/com/fr/plugin/designer/CptxAppTest.java → designer-realize/src/test/java/com/fr/nx/app/designer/CptxAppTest.java
Unescape View File

@ -1,10 +1,10 @@
package com.fr.plugin.designer;
package com.fr.nx.app.designer;
import com.fr.file.AbstractFILE;
import com.fr.file.FILE;
import com.fr.main.impl.WorkBook;
import com.fr.nx.app.designer.utils.DesignerCptxFileUtils;
import com.fr.nx.cptx.utils.CptxFileUtils;
import com.fr.plugin.designer.utils.DesignerCptxFileUtils;
import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.FixMethodOrder;

8
designer-realize/src/test/java/com/fr/plugin/designer/JStreamBookTest.java → designer-realize/src/test/java/com/fr/nx/app/designer/JStreamBookTest.java
Unescape View File

@ -1,10 +1,10 @@
package com.fr.plugin.designer;
package com.fr.nx.app.designer;
import com.fr.file.FILE;
import com.fr.main.impl.WorkBook;
import com.fr.plugin.designer.toolbar.TemplateTransformer;
import com.fr.plugin.designer.toolbar.TransformResult;
import com.fr.plugin.designer.toolbar.TransformResultInfo;
import com.fr.nx.app.designer.toolbar.TemplateTransformer;
import com.fr.nx.app.designer.toolbar.TransformResult;
import com.fr.nx.app.designer.toolbar.TransformResultInfo;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.junit.Assert;
Write Preview
Loading…
Cancel
Save