From dcce3eccb1d20acf4204b27c29800b6376af08e0 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 31 Jul 2017 17:27:14 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?= =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=3D=E3=80=8B=E5=8E=BB=E6=8E=89=E5=8E=9F?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E8=8F=9C=E5=8D=95=E9=A1=B9=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/ConditionAttributesAction.java | 37 ------------------- .../mainframe/ElementCasePaneDelegate.java | 1 - .../com/fr/grid/selection/CellSelection.java | 1 - .../src/com/fr/poly/creator/ECBlockPane.java | 1 - 4 files changed, 40 deletions(-) delete mode 100644 designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java diff --git a/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java b/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java deleted file mode 100644 index 0b32a05eb..000000000 --- a/designer/src/com/fr/design/actions/cell/ConditionAttributesAction.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved. - */ -package com.fr.design.actions.cell; - -import com.fr.base.BaseUtils; -import com.fr.design.menu.KeySetUtils; -import com.fr.design.present.ConditionAttributesGroupPane; -import com.fr.design.dialog.BasicPane; -import com.fr.design.mainframe.ElementCasePane; -import com.fr.report.cell.TemplateCellElement; - -/** - * Condition Attributes. - */ -public class ConditionAttributesAction extends AbstractCellElementAction { - public ConditionAttributesAction(ElementCasePane t) { - super(t); - this.setMenuKeySet(KeySetUtils.CONDITION_ATTR); - this.setName(getMenuKeySet().getMenuKeySetName()); - this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/highlight.png")); - } - - @Override - protected BasicPane populateBasicPane(TemplateCellElement cellElement) { - ConditionAttributesGroupPane pane = ConditionAttributesGroupPane.getInstance(); - pane.populate(cellElement.getHighlightGroup()); - - return pane; - } - - @Override - protected void updateBasicPane(BasicPane bp, TemplateCellElement cellElement) { - cellElement.setHighlightGroup(((ConditionAttributesGroupPane)bp).updateHighlightGroup()); - } -} \ No newline at end of file diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java index d94270e3e..7cd32d627 100644 --- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java +++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java @@ -183,7 +183,6 @@ public class ElementCasePaneDelegate extends ElementCasePane { menuDef.addShortCut(new CellExpandAttrAction()); menuDef.addShortCut(new CellWidgetAttrAction(this)); menuDef.addShortCut(new GlobalStyleMenuDef(this)); - menuDef.addShortCut(new ConditionAttributesAction(this)); // 单元格形态 menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this)); diff --git a/designer/src/com/fr/grid/selection/CellSelection.java b/designer/src/com/fr/grid/selection/CellSelection.java index 6a7adbd9d..a5b139af5 100644 --- a/designer/src/com/fr/grid/selection/CellSelection.java +++ b/designer/src/com/fr/grid/selection/CellSelection.java @@ -458,7 +458,6 @@ public class CellSelection extends Selection { } popup.add(new CellExpandAttrAction().createMenuItem()); popup.add(DeprecatedActionManager.getPresentMenu(ePane).createJMenu()); - popup.add(new ConditionAttributesAction(ePane).createMenuItem()); popup.add(new CellAttributeAction().createMenuItem()); // cut, copy and paste popup.addSeparator(); diff --git a/designer/src/com/fr/poly/creator/ECBlockPane.java b/designer/src/com/fr/poly/creator/ECBlockPane.java index fbc5e1f8a..f6e8eb9be 100644 --- a/designer/src/com/fr/poly/creator/ECBlockPane.java +++ b/designer/src/com/fr/poly/creator/ECBlockPane.java @@ -142,7 +142,6 @@ public class ECBlockPane extends PolyElementCasePane { menuDef.addShortCut(new CellExpandAttrAction()); menuDef.addShortCut(new CellWidgetAttrAction(this)); menuDef.addShortCut(new GlobalStyleMenuDef(this)); - menuDef.addShortCut(new ConditionAttributesAction(this)); // 单元格形态 menuDef.addShortCut(DeprecatedActionManager.getPresentMenu(this));