diff --git a/designer-base/src/main/java/com/fr/design/selection/SelectableElement.java b/designer-base/src/main/java/com/fr/design/selection/SelectableElement.java index bd6a5d401..8ecb1dcf2 100644 --- a/designer-base/src/main/java/com/fr/design/selection/SelectableElement.java +++ b/designer-base/src/main/java/com/fr/design/selection/SelectableElement.java @@ -14,7 +14,7 @@ public interface SelectableElement { * * @return */ - + @SuppressWarnings("rawtypes") QuickEditor getQuickEditor(TargetComponent tc); /** diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java index e58f7bd08..ca24adc3c 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java @@ -149,7 +149,6 @@ public abstract class ElementCasePane extends Tar public static final int HORIZONTAL_OVER = 1; public static final int VERTICAL_OVER = 2; - public static int C = 0; // alex:既可以是选中一片单元格,也可以是选中一个悬浮元素 //august:默认是个不存在的选择。方便初始化时触发GridSelectionChangeListener事件 private Selection selection = new CellSelection(-1, -1, -1, -1); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneDelegate.java index 2e65c9815..44992a84b 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneDelegate.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneDelegate.java @@ -26,7 +26,6 @@ import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; import com.fr.design.present.ConditionAttributesGroupPane; import com.fr.design.roleAuthority.RolesAlreadyEditedPane; -import com.fr.design.selection.QuickEditor; import com.fr.design.selection.SelectionEvent; import com.fr.design.selection.SelectionListener; import com.fr.grid.selection.FloatSelection; @@ -82,10 +81,8 @@ public class ElementCasePaneDelegate extends ElementCasePane { } CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this); CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this); - long s = System.currentTimeMillis(); - QuickEditor quickEditor = getCurrentEditor(); - QuickEditorRegion.getInstance().populate(quickEditor); - System.out.println("getAndPopulate:"+(System.currentTimeMillis()-s)); + + QuickEditorRegion.getInstance().populate(getCurrentEditor()); JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); // 模板初始化完成后,才能初始化超级链接面板 if (editingTemplate != null && !editingTemplate.isUpMode()) { @@ -105,9 +102,7 @@ public class ElementCasePaneDelegate extends ElementCasePane { EastRegionContainerPane.getInstance().replaceFloatElementPane(ReportFloatPane.getInstance()); EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT); - s = System.currentTimeMillis(); EastRegionContainerPane.getInstance().replaceCellAttrPane(CellElementPropertyPane.getInstance()); - System.out.println("EastRegionContainerPane.getInstance().replaceCellAttrPane:"+(System.currentTimeMillis()-s)); EastRegionContainerPane.getInstance().replaceCellElementPane(QuickEditorRegion.getInstance()); EastRegionContainerPane.getInstance().replaceConditionAttrPane(conditionAttributesGroupPane); EastRegionContainerPane.getInstance().replaceWidgetSettingsPane(CellWidgetPropertyPane.getInstance());