From 386dd3a97c8f49cbf3a0136f483a9c7a6454a59a Mon Sep 17 00:00:00 2001 From: PanLi320 <854954082@qq.com> Date: Thu, 17 Nov 2016 19:52:31 +0800 Subject: [PATCH 01/18] 1 1 --- designer_base/src/com/fr/design/extra/PluginHelper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index 4a4870ba2..6773704ed 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -15,6 +15,7 @@ import com.fr.plugin.dependence.PluginDependenceUnit; import com.fr.stable.ArrayUtils; import com.fr.stable.EncodeConstants; import com.fr.stable.StableUtils; +import com.fr.stable.StringUtils; import com.fr.stable.project.ProjectConstants; import com.fr.stable.xml.XMLTools; @@ -47,6 +48,9 @@ public class PluginHelper { * @param p 下载百分比处理 */ public static void downloadPluginFile(String id, String username, String password, Process p) throws Exception { + if (StringUtils.isEmpty(id) || StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) { + return; + } HttpClient httpClient = new HttpClient(getDownloadPath(id, username, password)); if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) { int totalSize = httpClient.getContentLength(); From e02e4d26139d94f26d37ed45c2f1e93eb894ccd9 Mon Sep 17 00:00:00 2001 From: PanLi320 <854954082@qq.com> Date: Fri, 18 Nov 2016 10:06:25 +0800 Subject: [PATCH 02/18] 1 1 --- designer_base/src/com/fr/design/extra/PluginHelper.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index 6773704ed..f7597d383 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -48,7 +48,10 @@ public class PluginHelper { * @param p 下载百分比处理 */ public static void downloadPluginFile(String id, String username, String password, Process p) throws Exception { - if (StringUtils.isEmpty(id) || StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) { + if (StringUtils.isEmpty(id)) { + return; + } + if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) { return; } HttpClient httpClient = new HttpClient(getDownloadPath(id, username, password)); From 68c08af6411b072f48004386c5ef5b9f71e2ef0a Mon Sep 17 00:00:00 2001 From: fr_shine Date: Fri, 18 Nov 2016 15:36:07 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E8=81=9A=E5=90=88=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/chart/ChartEditPane.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java index 052fee20d..92177a8e3 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartEditPane.java @@ -168,7 +168,9 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 } protected ChartDataPane createChartDataPane(String plotID) { - return ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener); + ChartDataPane chartDataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener); + chartDataPane.setSupportCellData(dataPane4SupportCell.isSupportCellData()); + return chartDataPane; } protected void addTypePane() { From 3ec44a3e77c9516f930bd7aa8766dc0234ad8315 Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 18 Nov 2016 16:04:45 +0800 Subject: [PATCH 04/18] =?UTF-8?q?REPORT-849=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=94=AF=E6=8C=81=E6=8B=96=E6=8B=BD=EF=BC=88?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=BE=83=E9=95=BF=E7=9A=84=E6=98=BE=E7=A4=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/DBTableDataPane.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index 5b1ed2feb..708ea9152 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -28,6 +28,7 @@ import com.fr.design.gui.syntax.ui.rtextarea.RTextScrollPane; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ToolBarDef; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.script.Calculator; @@ -125,9 +126,12 @@ public class DBTableDataPane extends AbstractTableDataPane { } } }); - - this.add(connectionTableProcedurePane, BorderLayout.WEST); - this.add(sqlSplitPane, BorderLayout.CENTER); + box.setMinimumSize(new Dimension(310, 400)); + // 使用SplitPane + JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, connectionTableProcedurePane, sqlSplitPane); + mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); + mainSplitPane.setOneTouchExpandable(true); + this.add(mainSplitPane, BorderLayout.CENTER); } private boolean isPreviewOrRefreshButton (FocusEvent e) { From 422e021582a5fae426e79774d77dc34e22f30db4 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Fri, 18 Nov 2016 16:20:06 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E5=8F=AF=E8=AE=BE=E7=BD=AEdialog=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/frpane/UICorrelationComboBoxPane.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java b/designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java index c5837727e..b2e30f41f 100644 --- a/designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java +++ b/designer_base/src/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java @@ -46,6 +46,7 @@ import com.fr.stable.StringUtils; import com.fr.design.utils.gui.GUICoreUtils; public class UICorrelationComboBoxPane extends JPanel implements UIObserver { + private static final Dimension DIALOG_SIZE = new Dimension(500, 500); private JPopupMenu popMenu; private UIMenuTable tablePane; private UIButton addButton; @@ -79,6 +80,9 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { } } + protected Dimension getDialogSize() { + return DIALOG_SIZE; + } /** * 刷新下拉列表和按钮 @@ -120,7 +124,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { fireTargetChanged(); } }); - dialog.setSize(500, 500); + dialog.setSize(getDialogSize()); GUICoreUtils.centerWindow(dialog); dialog.setVisible(true); } @@ -202,7 +206,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { fireTargetChanged(); } }); - dialog.setSize(500, 500); + dialog.setSize(getDialogSize()); dialog.setVisible(true); } else { popMenu.show(UICorrelationComboBoxPane.this, addButton.getX() + 1, addButton.getY() + addButton.getHeight()); From e2da2e04d41a86e3786a63771d86b5ab61076c06 Mon Sep 17 00:00:00 2001 From: kerry Date: Mon, 21 Nov 2016 10:00:57 +0800 Subject: [PATCH 06/18] =?UTF-8?q?REPORT-849=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=94=AF=E6=8C=81=E6=8B=96=E6=8B=BD=EF=BC=88?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=BE=83=E9=95=BF=E7=9A=84=E6=98=BE=E7=A4=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabledata/tabledatapane/DBTableDataPane.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index 708ea9152..b0fba71c9 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -48,8 +48,8 @@ import java.util.ArrayList; import java.util.List; public class DBTableDataPane extends AbstractTableDataPane { - private static final String PREVIEW_BUTTON = Inter.getLocText("Preview"); - private static final String REFRESH_BUTTON = Inter.getLocText("Refresh"); + private static final String PREVIEW_BUTTON = Inter.getLocText("FR-Designer_Preview"); + private static final String REFRESH_BUTTON = Inter.getLocText("FR-Designer_Refresh"); private ConnectionTableProcedurePane connectionTableProcedurePane; private UITableEditorPane editorPane; @@ -78,7 +78,7 @@ public class DBTableDataPane extends AbstractTableDataPane { JPanel paraMeanPane = new JPanel(new BorderLayout()); paraMeanPane.setPreferredSize(new Dimension(680, 90)); - UILabel paraMean = new UILabel(Inter.getLocText("Datasource-Param_DES")); + UILabel paraMean = new UILabel(Inter.getLocText("FR-Designer-Datasource-Param_DES")); paraMeanPane.add(paraMean, BorderLayout.CENTER); ParameterTableModel model = new ParameterTableModel() { @@ -144,7 +144,7 @@ public class DBTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("DS-Database_Query"); + return Inter.getLocText("FR-Designer-DS-Database_Query"); } private void refresh() { @@ -164,7 +164,7 @@ public class DBTableDataPane extends AbstractTableDataPane { toolBarDef.addShortCut(new PreviewAction()); toolBarDef.addShortCut(SeparatorDef.DEFAULT); toolBarDef.addShortCut(new EditPageQueryAction()); - isShareCheckBox = new UICheckBox(Inter.getLocText("Is_Share_DBTableData")); + isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData")); maxPanel = new MaxMemRowCountPanel(); maxPanel.setBorder(null); UIToolbar editToolBar = ToolBarDef.createJToolBar(); @@ -237,7 +237,7 @@ public class DBTableDataPane extends AbstractTableDataPane { String dbName = this.connectionTableProcedurePane.getSelectedDatabaseConnnectonName(); if (StringUtils.isBlank(dbName) || StringUtils.isBlank(this.sqlTextPane.getText())) { try { - throw new Exception(Inter.getLocText("Connect_SQL_Cannot_Null") + "."); + throw new Exception(Inter.getLocText("FR-Designer_Connect_SQL_Cannot_Null") + "."); } catch (Exception e) { // JOptionPane.showMessageDialog(DBTableDataPane.this, // Inter.getLocText("Connect_SQL_Cannot_Null") + "."); @@ -292,7 +292,7 @@ public class DBTableDataPane extends AbstractTableDataPane { private class EditPageQueryAction extends UpdateAction { public EditPageQueryAction() { - this.setName(Inter.getLocText("LayerPageReport_PageQuery")); + this.setName(Inter.getLocText("FR-Designer-LayerPageReport_PageQuery")); this.setMnemonic('L'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png")); } @@ -342,7 +342,7 @@ public class DBTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("LayerPageReport_Define_PageQuerySQL"); + return Inter.getLocText("FR-Designer-LayerPageReport_Define_PageQuerySQL"); } } } \ No newline at end of file From a1d72bb047f93f95342e00a328b60561abde0218 Mon Sep 17 00:00:00 2001 From: PanLi320 <854954082@qq.com> Date: Mon, 21 Nov 2016 14:01:43 +0800 Subject: [PATCH 07/18] =?UTF-8?q?REPORT-809=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86=E7=82=B9=E5=87=BB=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=9B=B4=E6=96=B0=E4=BC=9A=E6=8F=90=E7=A4=BA=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E5=BA=94=E7=94=A8=E5=95=86=E5=BA=97=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/extra/PluginHelper.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/extra/PluginHelper.java b/designer_base/src/com/fr/design/extra/PluginHelper.java index f7597d383..ecaa34ea0 100644 --- a/designer_base/src/com/fr/design/extra/PluginHelper.java +++ b/designer_base/src/com/fr/design/extra/PluginHelper.java @@ -48,10 +48,7 @@ public class PluginHelper { * @param p 下载百分比处理 */ public static void downloadPluginFile(String id, String username, String password, Process p) throws Exception { - if (StringUtils.isEmpty(id)) { - return; - } - if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) { + if (!PluginHelper.invalidUser(id, username, password)) { return; } HttpClient httpClient = new HttpClient(getDownloadPath(id, username, password)); @@ -79,6 +76,16 @@ public class PluginHelper { } } + private static boolean invalidUser(String id, String username, String password) { + if (StringUtils.isEmpty(id)) { + return false; + } else if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)){ + return false; + } else { + return true; + } + } + private static String getDownloadPath(String id, String username, String password) throws Exception { HashMap map = new HashMap(); map.put("id", id); From 12a8f10b116dbab50d509ff5439e63f167062e92 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Mon, 21 Nov 2016 15:06:49 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=85=AC=E5=BC=8F=E6=B2=A1=E6=9C=89335$?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/formula/TinyFormulaPane.java | 6 +++++- .../gui/data/report/AbstractReportDataContentPane.java | 7 ++++++- .../gui/data/report/CategoryPlotReportDataContentPane.java | 5 +++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/formula/TinyFormulaPane.java b/designer_base/src/com/fr/design/formula/TinyFormulaPane.java index 16c897bc1..a7ea7b6cf 100644 --- a/designer_base/src/com/fr/design/formula/TinyFormulaPane.java +++ b/designer_base/src/com/fr/design/formula/TinyFormulaPane.java @@ -56,7 +56,7 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver @Override public void doOk() { Formula fm = formulaPane.update(); - if (fm.getContent().length() <= 1) { + if (dealEmpty() && fm.getContent().length() <= 1) { formulaTextField.setText("$$$"); } else { formulaTextField.setText(fm.getContent()); @@ -69,6 +69,10 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver initLayout(); } + protected boolean dealEmpty() { + return true; + } + protected void initLayout() { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java index 6754ca796..dd24b450c 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java @@ -3,8 +3,8 @@ package com.fr.design.mainframe.chart.gui.data.report; import com.fr.base.Formula; import com.fr.base.Utils; import com.fr.chart.chartattr.ChartCollection; -import com.fr.design.constants.UIConstants; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.constants.UIConstants; import com.fr.design.event.UIObserverListener; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.frpane.UICorrelationPane; @@ -155,6 +155,11 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane Date: Mon, 21 Nov 2016 15:18:33 +0800 Subject: [PATCH 09/18] pmd --- designer_base/src/com/fr/design/formula/TinyFormulaPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/formula/TinyFormulaPane.java b/designer_base/src/com/fr/design/formula/TinyFormulaPane.java index a7ea7b6cf..da60d4f23 100644 --- a/designer_base/src/com/fr/design/formula/TinyFormulaPane.java +++ b/designer_base/src/com/fr/design/formula/TinyFormulaPane.java @@ -42,7 +42,7 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver // 添加一公式编辑器按钮 formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png")); - formulaTextFieldButton.setToolTipText(Inter.getLocText("Formula") + "..."); + formulaTextFieldButton.setToolTipText(Inter.getLocText("FR-Designer_Formula") + "..."); formulaTextFieldButton.setPreferredSize(new Dimension(24, 20)); formulaTextFieldButton.setOpaque(false); formulaTextFieldButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); From 0cde4e25916f4902d989dd5692295bac5c538a29 Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 21 Nov 2016 15:20:25 +0800 Subject: [PATCH 10/18] =?UTF-8?q?REPORT-841=20=E8=A1=A8=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E9=87=8D=E5=91=BD=E5=90=8D=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=9D=97=E5=86=85=E5=AE=B9=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/data/BasicTableDataTreePane.java | 6 +++--- .../com/fr/design/data/datapane/TableDataTreePane.java | 8 +++++++- .../com/fr/design/mainframe/FormCreatorDropTarget.java | 5 ++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java b/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java index a76d4a105..92f02d5f4 100644 --- a/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java +++ b/designer_base/src/com/fr/design/data/BasicTableDataTreePane.java @@ -428,11 +428,11 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp } /** - * 合并数据集 + * 合并数据集并返回自动更改数据集名字的新老名字键值对 * @param srcName 数据集来源(比如报表块，就是报表块的名称) * @param tableDataSource 数据集 */ - public void addTableData(String srcName, TableDataSource tableDataSource) { - + public Map addTableData(String srcName, TableDataSource tableDataSource) { + return new HashMap<>(0); } } diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java index 219093c6d..959abc98f 100644 --- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java @@ -275,13 +275,15 @@ public class TableDataTreePane extends BasicTableDataTreePane { * @param srcName 数据集来源(比如报表块，就是报表块的名称) * @param tableDataSource 数据集 */ - public void addTableData(String srcName, TableDataSource tableDataSource) { + public Map addTableData(String srcName, TableDataSource tableDataSource) { + Map tdNameMap=new HashMap<>(); allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook()); DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER); TableDataSource tds = tc.getBook(); Iterator tdIterator = tableDataSource.getTableDataNameIterator(); while (tdIterator.hasNext()) { String tdName = (String) tdIterator.next(); + String oldName = tdName; TableData td = tableDataSource.getTableData(tdName); if (tds.getTableData(tdName) != null || isDsNameRepeaded(tdName)) {//如果有同名的就拼上来源名称 tdName = srcName + tdName; @@ -292,8 +294,12 @@ public class TableDataTreePane extends BasicTableDataTreePane { tdName += i; } tds.putTableData(tdName, td); + if (!ComparatorUtils.equals(oldName, tdName)) { + tdNameMap.put(oldName, tdName); + } } tc.parameterChanged(); dataTree.refresh(); + return tdNameMap; } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java b/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java index 7e7035bb7..b4bfe270f 100644 --- a/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java +++ b/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java @@ -26,6 +26,7 @@ import java.awt.dnd.DropTarget; import java.awt.dnd.DropTargetDragEvent; import java.awt.dnd.DropTargetDropEvent; import java.awt.dnd.DropTargetEvent; +import java.util.Map; /** * 添加模式下鼠标事件处理器。 @@ -88,7 +89,9 @@ public class FormCreatorDropTarget extends DropTarget { SharableElementCaseEditor sharableEditor = ShareLoader.getLoader().getSharedElCaseEditorById(shareId); ElCaseBindInfo bindInfo = ShareLoader.getLoader().getElCaseBindInfoById(shareId); if (sharableEditor != null && bindInfo != null) { - TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).addTableData(bindInfo.getName(),sharableEditor.getTableDataSource()); + Map tdNameMap = TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).addTableData(bindInfo.getName(), sharableEditor.getTableDataSource()); + //合并数据集之后,可能会有数据集名称变化，做一下联动 + sharableEditor.batchRenameTdName(tdNameMap); } } Widget widget = (addingXCreator.getTopLayout() != null) ? (addingXCreator.getTopLayout().toData()) : addingXCreator.toData(); From 67d4b3f4f6b4834c8236de9701ce910574335cee Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 21 Nov 2016 15:21:50 +0800 Subject: [PATCH 11/18] d --- .../src/com/fr/design/data/datapane/TableDataTreePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java index 959abc98f..cbab58533 100644 --- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java @@ -290,7 +290,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { } int i = 0; while (tds.getTableData(tdName) != null) { - i++;//如果拼上名字后依然已经存在就加编号 + i++;//如果拼上名字后依然已经存在就加编号 tdName += i; } tds.putTableData(tdName, td); From 1cbc5c1f53ba467e0a975d0918f8fb4880326d2a Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 21 Nov 2016 15:22:10 +0800 Subject: [PATCH 12/18] d --- .../src/com/fr/design/data/datapane/TableDataTreePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java index cbab58533..959abc98f 100644 --- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java @@ -290,7 +290,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { } int i = 0; while (tds.getTableData(tdName) != null) { - i++;//如果拼上名字后依然已经存在就加编号 + i++;//如果拼上名字后依然已经存在就加编号 tdName += i; } tds.putTableData(tdName, td); From 284fae5ef419b3d21925195f32bf59eb79b3c075 Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 21 Nov 2016 15:53:33 +0800 Subject: [PATCH 13/18] =?UTF-8?q?REPORT-841=20=E4=BB=A3=E7=A0=81=E8=B4=A8?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/data/datapane/TableDataTreePane.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java index 959abc98f..5a893803c 100644 --- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java @@ -38,6 +38,7 @@ import java.awt.dnd.DnDConstants; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -276,7 +277,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { * @param tableDataSource 数据集 */ public Map addTableData(String srcName, TableDataSource tableDataSource) { - Map tdNameMap=new HashMap<>(); + Map tdNameMap = new HashMap<>(); allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook()); DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER); TableDataSource tds = tc.getBook(); @@ -300,6 +301,6 @@ public class TableDataTreePane extends BasicTableDataTreePane { } tc.parameterChanged(); dataTree.refresh(); - return tdNameMap; + return Collections.unmodifiableMap(tdNameMap); } } \ No newline at end of file From c931aec0386fab64d572eb9b805e6352f3702b95 Mon Sep 17 00:00:00 2001 From: fr_shine Date: Mon, 21 Nov 2016 16:36:01 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/formula/TinyFormulaPane.java | 14 +++++++------- .../data/report/AbstractReportDataContentPane.java | 4 ++-- .../report/CategoryPlotReportDataContentPane.java | 5 +++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/designer_base/src/com/fr/design/formula/TinyFormulaPane.java b/designer_base/src/com/fr/design/formula/TinyFormulaPane.java index da60d4f23..649d5face 100644 --- a/designer_base/src/com/fr/design/formula/TinyFormulaPane.java +++ b/designer_base/src/com/fr/design/formula/TinyFormulaPane.java @@ -56,11 +56,7 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver @Override public void doOk() { Formula fm = formulaPane.update(); - if (dealEmpty() && fm.getContent().length() <= 1) { - formulaTextField.setText("$$$"); - } else { - formulaTextField.setText(fm.getContent()); - } + populateTextField(fm); okEvent(); } }).setVisible(true); @@ -69,8 +65,12 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver initLayout(); } - protected boolean dealEmpty() { - return true; + protected void populateTextField(Formula fm) { + if (fm.getContent().length() <= 1) { + formulaTextField.setText("$$$"); + } else { + formulaTextField.setText(fm.getContent()); + } } protected void initLayout() { diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java index dd24b450c..4ff643522 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/report/AbstractReportDataContentPane.java @@ -157,8 +157,8 @@ public abstract class AbstractReportDataContentPane extends BasicBeanPane Date: Mon, 21 Nov 2016 17:18:41 +0800 Subject: [PATCH 15/18] =?UTF-8?q?REPORT-702=20=E8=A1=A8=E5=8D=95=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E5=9D=97=E9=AB=98=E5=BA=A6=E4=BC=9A=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/designer/creator/XWFitLayout.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java index 04904a723..682a19590 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java @@ -159,7 +159,10 @@ public class XWFitLayout extends XLayoutContainer { creator.updateChildBound(getActualMinHeight()); } // 布局内部组件放大缩小后，都是乘以百分比后取整，可能会产生空隙，此处调整容器 - this.setSize(containerW + margin.getLeft() + margin.getRight(), containerH + margin.getTop() + margin.getBottom()); + this.setSize( + containerW + (int)(margin.getLeft() * (1.0+percent) + margin.getRight() * (1.0+percent)), + containerH + (int)(margin.getTop() * (1.0+percent) + margin.getBottom() * (1.0+percent)) + ); updateCreatorsBackupBound(); // 间隔也按显示大小比例调整 if (!hasCalGap) { @@ -239,7 +242,7 @@ public class XWFitLayout extends XLayoutContainer { posX.add(margin.getLeft()); int width = this.getWidth() - margin.getLeft() - margin.getRight(); int containW = (int) (width / perc); - posX.add(containW); + posX.add(containW + margin.getLeft()); for (int i=0, len=this.getComponentCount(); i < len; i++) { int x = this.getComponent(i).getX(); int finalX = (int) (x / perc); @@ -265,7 +268,7 @@ public class XWFitLayout extends XLayoutContainer { posY.add(margin.getTop()); int height = this.getHeight() - margin.getTop() - margin.getBottom(); int containH = (int) (height / perc); - posY.add(containH); + posY.add(containH + margin.getTop()); for (int i=0, len=this.getComponentCount(); i < len; i++) { int y = this.getComponent(i).getY(); int finalY = (int) (y / perc); From 72dedac000c166f96d0dc8146821ac1a8d828f68 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 21 Nov 2016 19:25:09 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E4=BD=8E=E5=88=86=E8=BE=A8=E7=8E=87?= =?UTF-8?q?=E4=B8=8B=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/icontainer/UIResizableContainer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java b/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java index 13ea214ec..d16622184 100644 --- a/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java +++ b/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java @@ -3,7 +3,6 @@ package com.fr.design.gui.icontainer; import com.fr.base.BaseUtils; import com.fr.design.constants.UIConstants; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.mainframe.EastRegionContainerPane; import com.fr.stable.Constants; import com.fr.design.utils.gui.GUICoreUtils; @@ -217,8 +216,8 @@ public class UIResizableContainer extends JPanel { } } else if (direction == Constants.LEFT) { if(isDownPaneVisible){ - if (toolPaneY > getHeight() - toolPaneHeight) { - toolPaneY = getHeight() - toolPaneHeight; + if (toolPaneY > getHeight() - toolPaneHeight - getParameterPaneHeight()) { + toolPaneY = getHeight() - toolPaneHeight - getParameterPaneHeight(); } parameterPane.setBounds(20, 0, 230, getParameterPaneHeight()); upPane.setBounds(toolPaneHeight, getParameterPaneHeight(), containerWidth - toolPaneHeight, toolPaneY); From 276847ff480370b4e9622c63d15b6db3cb275448 Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 21 Nov 2016 20:45:05 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=8D=E7=94=A8=E7=9A=84=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E5=AE=89=E8=A3=85=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=98=AF=E6=8A=8A?= =?UTF-8?q?reu=E6=96=87=E4=BB=B6=E6=8B=86=E5=88=86=E6=88=90=E4=B8=A4?= =?UTF-8?q?=E4=B8=AAxml=E5=88=86=E5=88=AB=E4=BC=A0=E7=BB=99=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=AB=AF=EF=BC=8C=E7=9B=B4=E6=8E=A5=E7=BB=99=E6=AD=A3?= =?UTF-8?q?=E6=96=87=E5=A1=9Ereu=E6=96=87=E4=BB=B6=E7=9A=84=E4=BA=8C?= =?UTF-8?q?=E8=BF=9B=E5=88=B6=E4=BC=9A=E5=9B=A0=E4=B8=BAtostring=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E9=80=A0=E6=88=90=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/env/RemoteEnv.java | 60 ++++++++++++--------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index ce7118e69..70c18fbd0 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -2114,6 +2114,7 @@ public class RemoteEnv implements Env { StableUtils.mkdirs(target); File cacheDir = null; File zip = null; + OutputStream out = null; try { HashMap para = new HashMap(); para.put("op", "fr_remote_design"); @@ -2122,16 +2123,15 @@ public class RemoteEnv implements Env { para.put("currentUsername", this.getUser()); HttpClient client = createHttpMethod(para); - InputStream input = client.getResponseStream(); + InputStream input = client.getResponseStream();//拿到服务端传过来的整个共享文件夹的压缩文件的文件流 zip = new File(StableUtils.pathJoin(CacheManager.getProviderInstance().getCacheDirectory().getAbsolutePath()), "share.zip"); cacheDir = new File(StableUtils.pathJoin(CacheManager.getProviderInstance().getCacheDirectory().getAbsolutePath()), ShareConstants.DIR_SHARE_CACHE); StableUtils.deleteFile(cacheDir); StableUtils.mkdirs(cacheDir); StableUtils.makesureFileExist(zip); - FileOutputStream out = new FileOutputStream(zip); - IOUtils.copyBinaryTo(input, out); - out.flush(); - out.close(); + out = new FileOutputStream(zip); + IOUtils.copyBinaryTo(input, out);//放到本地缓存目录下 + IOUtils.unzip(zip, cacheDir.getAbsolutePath(), EncodeConstants.ENCODING_GBK);//先解压到临时目录 if (cacheDir.exists() && cacheDir.isDirectory()) { return cacheDir.listFiles(new FilenameFilter() { @@ -2144,6 +2144,10 @@ public class RemoteEnv implements Env { } catch (Exception e) { FRContext.getLogger().error(e.getMessage()); } finally { + if (out != null) { + out.flush(); + out.close(); + } StableUtils.deleteFile(zip); } return new File[0]; @@ -2151,25 +2155,33 @@ public class RemoteEnv implements Env { @Override public boolean installREUFile(File reuFile) { -// if (reuFile == null) { -// return false; -// } -// try { -// HashMap para = new HashMap(); -// para.put("op", "fr_remote_design"); -// para.put("cmd", "design_install_reufile"); -// para.put("current_uid", this.createUserID()); -// para.put("currentUsername", this.getUser()); -// para.put("reuFileName", reuFile.getName()); -// -// HttpClient client = createHttpMethod(para); -// client.setContent(IOUtils.inputStream2Bytes(new FileInputStream(reuFile))); -// InputStream input = execute4InputStream(client); -// return ComparatorUtils.equals(stream2String(input), "true"); -// } catch (Exception e) { -// return false; -// } - return false; + if (reuFile == null) { + return false; + } + File tempFile = new File(CacheManager.getProviderInstance().getCacheDirectory(), "temp_remote"); + IOUtils.unzip(reuFile, tempFile.getAbsolutePath()); + String shareXMLName = StableUtils.pathJoin(tempFile.getAbsolutePath(), ShareConstants.NAME_XML_MODULE); + String helpXMLName = StableUtils.pathJoin(tempFile.getAbsolutePath(), ShareConstants.NAME_XML_HELP); + try { + HashMap para = new HashMap(); + para.put("op", "fr_remote_design"); + para.put("cmd", "design_install_reufile"); + para.put("current_uid", this.createUserID()); + para.put("currentUsername", this.getUser()); + para.put("reuFileName", reuFile.getName()); + + HttpClient client = createHttpMethod(para); + client.setContent(IOUtils.inputStream2Bytes(new FileInputStream(new File(shareXMLName)))); + InputStream input = execute4InputStream(client); + client.release(); + para.put("isComplete", "true"); + HttpClient client1 = createHttpMethod(para); + client1.setContent(IOUtils.inputStream2Bytes(new FileInputStream(new File(helpXMLName)))); + InputStream input1 = execute4InputStream(client1); + return ComparatorUtils.equals(stream2String(input), "true") && ComparatorUtils.equals(stream2String(input1), "true"); + } catch (Exception e) { + return false; + } } @Override From a848d5736eacea80e47636efb4d173f90254fe33 Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 21 Nov 2016 20:53:58 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20PMD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/FormCreatorDropTarget.java | 89 +++++++++---------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java b/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java index b4bfe270f..18ad2ab71 100644 --- a/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java +++ b/designer_form/src/com/fr/design/mainframe/FormCreatorDropTarget.java @@ -56,15 +56,11 @@ public class FormCreatorDropTarget extends DropTarget { private void adding(int x, int y) { // 当前鼠标所在的组件 XCreator hoveredComponent = designer.getComponentAt(x, y); - // 获取该组件所在的焦点容器 XLayoutContainer container = XCreatorUtils.getHotspotContainer(hoveredComponent); - //cardTagLayout里用到 container.stopAddingState(designer); - boolean success = false; - if (container != null) { // 如果是容器，则调用其acceptComponent接受组件 AddingModel model = designer.getAddingModel(); @@ -77,7 +73,6 @@ public class FormCreatorDropTarget extends DropTarget { } cancelPromptWidgetForbidEnter(); } - if (success) { // 如果添加成功，则触发相应事件 XCreator xCreator = container.acceptType(XWParameterLayout.class) ? designer.getParaComponent() : designer.getRootComponent(); @@ -101,7 +96,6 @@ public class FormCreatorDropTarget extends DropTarget { } else { Toolkit.getDefaultToolkit().beep(); } - // 取消提示 designer.setPainter(null); // 切换添加状态到普通状态 @@ -132,47 +126,9 @@ public class FormCreatorDropTarget extends DropTarget { //提示组件是否可以拖入 promptUser(x, y, container); if (container != null) { - HoverPainter painter = null; - if (container != current || designer.getPainter() == null) { - // 如果焦点容器不是当前容器 - if (current != null) { - // 取消前一个焦点容器的提示渲染器 - designer.setPainter(null); - } - //获取painter的时候要考虑布局之间嵌套的问题 - XLayoutContainer xLayoutContainer = container.getTopLayout(); - if (xLayoutContainer != null && xLayoutContainer.getParent() != null - && ((XLayoutContainer) xLayoutContainer.getParent()).acceptType(XWAbsoluteLayout.class)) { - if (!xLayoutContainer.isEditable()) { - xLayoutContainer = (XLayoutContainer) xLayoutContainer.getParent(); - } - } - painter = AdapterBus.getContainerPainter(designer, - xLayoutContainer != null && xLayoutContainer.acceptType(XWAbsoluteLayout.class) ? xLayoutContainer : container); - - // 为界面设计器设置提示渲染提示器 - designer.setPainter(painter); - - // 将当前容器更新为新的容器 - current = container; - } else { - // 获取当前设计界面的提示渲染器 - Painter p = designer.getPainter(); - if (p instanceof HoverPainter) { - painter = (HoverPainter) p; - } - } + dealWithContainer(x, y, container); - if (painter != null) { - // 为提示渲染器设置焦点位置、区域等渲染参数 - Rectangle rect = ComponentUtils.getRelativeBounds(container); - rect.x -= designer.getArea().getHorizontalValue(); - rect.y -= designer.getArea().getVerticalValue(); - painter.setRenderingBounds(rect); - painter.setHotspot(new Point(x, y)); - painter.setCreator(addingModel.getXCreator()); - } } else { // 如果鼠标不在任何组件上，则取消提示器 designer.setPainter(null); @@ -181,6 +137,49 @@ public class FormCreatorDropTarget extends DropTarget { designer.repaint(); } + private void dealWithContainer(int x, int y, XLayoutContainer container) { + HoverPainter painter = null; + + if (container != current || designer.getPainter() == null) { + // 如果焦点容器不是当前容器 + if (current != null) { + // 取消前一个焦点容器的提示渲染器 + designer.setPainter(null); + } + //获取painter的时候要考虑布局之间嵌套的问题 + XLayoutContainer xLayoutContainer = container.getTopLayout(); + if (xLayoutContainer != null && xLayoutContainer.getParent() != null + && ((XLayoutContainer) xLayoutContainer.getParent()).acceptType(XWAbsoluteLayout.class)) { + if (!xLayoutContainer.isEditable()) { + xLayoutContainer = (XLayoutContainer) xLayoutContainer.getParent(); + } + } + painter = AdapterBus.getContainerPainter(designer, + xLayoutContainer != null && xLayoutContainer.acceptType(XWAbsoluteLayout.class) ? xLayoutContainer : container); + + // 为界面设计器设置提示渲染提示器 + designer.setPainter(painter); + + // 将当前容器更新为新的容器 + current = container; + } else { + // 获取当前设计界面的提示渲染器 + Painter p = designer.getPainter(); + if (p instanceof HoverPainter) { + painter = (HoverPainter) p; + } + } + if (painter != null) { + // 为提示渲染器设置焦点位置、区域等渲染参数 + Rectangle rect = ComponentUtils.getRelativeBounds(container); + rect.x -= designer.getArea().getHorizontalValue(); + rect.y -= designer.getArea().getVerticalValue(); + painter.setRenderingBounds(rect); + painter.setHotspot(new Point(x, y)); + painter.setCreator(addingModel.getXCreator()); + } + } + private void promptUser(int x, int y, XLayoutContainer container) { if (!addingModel.getXCreator().canEnterIntoParaPane() && container.acceptType(XWParameterLayout.class)) { promptButton.setText(Inter.getLocText("FR-Designer_Forbid_Drag_into_Para_Pane"));