|
|
|
@ -36,6 +36,7 @@ import com.fr.design.i18n.Toolkit;
|
|
|
|
|
import com.fr.design.mainframe.DesignerContext; |
|
|
|
|
import com.fr.design.menu.SeparatorDef; |
|
|
|
|
import com.fr.design.menu.ToolBarDef; |
|
|
|
|
import com.fr.design.utils.ParameterUtils; |
|
|
|
|
import com.fr.design.utils.gui.GUICoreUtils; |
|
|
|
|
import com.fr.esd.core.strategy.config.StrategyConfig; |
|
|
|
|
import com.fr.esd.core.strategy.config.StrategyConfigHelper; |
|
|
|
@ -213,7 +214,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
|
|
|
|
|
|
|
|
|
|
box.setMinimumSize(new Dimension(300, 400)); |
|
|
|
|
|
|
|
|
|
this.connectionTableProcedurePane.setMinimumSize(new Dimension(250, 400)); |
|
|
|
|
this.connectionTableProcedurePane.setMinimumSize(new Dimension(230, 400)); |
|
|
|
|
this.connectionTableProcedurePane.setMaximumSize(new Dimension(500, 400)); |
|
|
|
|
|
|
|
|
|
JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, this.connectionTableProcedurePane, sqlSplitPane); |
|
|
|
@ -243,9 +244,9 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
|
|
|
|
|
paramTexts[0] = SqlUtils.tryPureSqlText(this.sqlTextPane.getText()); |
|
|
|
|
paramTexts[1] = SqlUtils.tryPureSqlText(this.pageQuery); |
|
|
|
|
List<ParameterProvider> existParameterList = this.editorPane.update(); |
|
|
|
|
Parameter[] ps = (existParameterList == null) ? new Parameter[0] : (Parameter[]) existParameterList.toArray(new Parameter[0]); |
|
|
|
|
Parameter[] ps = (existParameterList == null) ? new Parameter[0] : existParameterList.toArray(new Parameter[0]); |
|
|
|
|
|
|
|
|
|
this.editorPane.populate(ParameterHelper.analyzeAndUnionSameParameters(paramTexts, ps)); |
|
|
|
|
this.editorPane.populate(ParameterUtils.analyzeAndUnionParameters(paramTexts, ps)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|