Browse Source

Merge pull request #17 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0

* commit 'cd3b268f4ade5d2d015530ce03fd358243d9c67c':
  CORE-72 代码质量
master
superman 7 years ago
parent
commit
f0bb3399c9
  1. 5
      designer/src/com/fr/design/mainframe/JWorkBook.java
  2. 6
      designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java
  3. 1
      designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java

5
designer/src/com/fr/design/mainframe/JWorkBook.java

@ -51,7 +51,7 @@ import com.fr.file.filetree.FileNode;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.general.ModuleContext; import com.fr.general.ModuleContext;
import com.fr.general.web.ParameterConsts; import com.fr.general.web.ParameterConstants;
import com.fr.grid.Grid; import com.fr.grid.Grid;
import com.fr.grid.GridUtils; import com.fr.grid.GridUtils;
import com.fr.io.exporter.EmbeddedTableDataExporter; import com.fr.io.exporter.EmbeddedTableDataExporter;
@ -62,7 +62,6 @@ import com.fr.poly.PolyDesigner;
import com.fr.poly.creator.BlockCreator; import com.fr.poly.creator.BlockCreator;
import com.fr.privilege.finegrain.WorkSheetPrivilegeControl; import com.fr.privilege.finegrain.WorkSheetPrivilegeControl;
import com.fr.report.ReportHelper; import com.fr.report.ReportHelper;
import com.fr.report.elementcase.ElementCase;
import com.fr.report.elementcase.TemplateElementCase; import com.fr.report.elementcase.TemplateElementCase;
import com.fr.report.poly.PolyWorkSheet; import com.fr.report.poly.PolyWorkSheet;
import com.fr.report.worksheet.WorkSheet; import com.fr.report.worksheet.WorkSheet;
@ -844,7 +843,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
*/ */
public void previewMenuActionPerformed(PreviewProvider provider) { public void previewMenuActionPerformed(PreviewProvider provider) {
setPreviewType(provider); setPreviewType(provider);
WebPreviewUtils.actionPerformed(this, provider.parametersForPreview(), ParameterConsts.REPORTLET); WebPreviewUtils.actionPerformed(this, provider.parametersForPreview(), ParameterConstants.REPORTLET);
} }
/** /**

6
designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java

@ -7,7 +7,7 @@ import com.fr.file.FILE;
import com.fr.file.FileNodeFILE; import com.fr.file.FileNodeFILE;
import com.fr.general.GeneralUtils; import com.fr.general.GeneralUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.general.web.ParameterConsts; import com.fr.general.web.ParameterConstants;
import com.fr.stable.project.ProjectConstants; import com.fr.stable.project.ProjectConstants;
import javax.swing.*; import javax.swing.*;
@ -16,11 +16,11 @@ import java.util.Map;
public final class WebPreviewUtils { public final class WebPreviewUtils {
public static void onWorkbookPreview(JTemplate<?, ?> jt) { public static void onWorkbookPreview(JTemplate<?, ?> jt) {
actionPerformed(jt, jt.getPreviewType().parametersForPreview(), ParameterConsts.REPORTLET); actionPerformed(jt, jt.getPreviewType().parametersForPreview(), ParameterConstants.REPORTLET);
} }
public static void onFormPreview(JTemplate<?, ?> jt) { public static void onFormPreview(JTemplate<?, ?> jt) {
actionPerformed(jt, null, ParameterConsts.FORMLET); actionPerformed(jt, null, ParameterConstants.FORMLET);
} }
public static void actionPerformed(JTemplate<?, ?> jt, Map<String, Object> map, String actionType) { public static void actionPerformed(JTemplate<?, ?> jt, Map<String, Object> map, String actionType) {

1
designer_base/src/com/fr/design/actions/server/PlatformManagerAction.java

@ -5,7 +5,6 @@ import com.fr.design.actions.UpdateAction;
import com.fr.design.menu.MenuKeySet; import com.fr.design.menu.MenuKeySet;
import com.fr.design.utils.DesignUtils; import com.fr.design.utils.DesignUtils;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.general.web.ParameterConsts;
import javax.swing.*; import javax.swing.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;

Loading…
Cancel
Save