Browse Source

Merge pull request #87 in BA/design from ~ZACK/design:dev to dev

* commit 'cef2c42140903950f7268ce89c5c3fa20a5edae8':
  服务器,模板数据集分组接口
master
superman 9 years ago
parent
commit
fa65bdfdfe
  1. 1
      designer/designer.iml
  2. 4
      designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
  3. 4
      designer/src/com/fr/design/present/StyleArrayPane.java
  4. 4
      designer/src/com/fr/design/report/share/ConfusionManagerPane.java
  5. 4
      designer/src/com/fr/design/widget/WidgetConfigPane.java
  6. 2
      designer_base/designer_base.iml
  7. 16
      designer_base/src/com/fr/design/ExtraDesignClassManager.java
  8. 24
      designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java
  9. 6
      designer_base/src/com/fr/design/data/datapane/TableDataListPane.java
  10. 4
      designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
  11. 4
      designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java
  12. 4
      designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java
  13. 32
      designer_base/src/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java
  14. 4
      designer_base/src/com/fr/design/formula/FunctionManagerPane.java
  15. 11
      designer_base/src/com/fr/design/fun/TableDataPaneProcessor.java
  16. 4
      designer_base/src/com/fr/design/fun/impl/AbstractTDPaneProcessor.java
  17. 893
      designer_base/src/com/fr/design/gui/controlpane/JControlPane.java
  18. 1028
      designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java
  19. 2
      designer_base/src/com/fr/design/gui/controlpane/ObjectJControlPane.java
  20. 4
      designer_base/src/com/fr/design/gui/frpane/HyperlinkGroupPane.java
  21. 4
      designer_base/src/com/fr/design/parameter/ParameterArrayPane.java
  22. 4
      designer_base/src/com/fr/env/EnvListPane.java
  23. 4
      designer_chart/src/com/fr/design/chart/ChartControlPane.java
  24. 4
      designer_chart/src/com/fr/design/chart/axis/ChartAlertLinePane.java
  25. 4
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java
  26. 4
      designer_chart/src/com/fr/design/chart/series/SeriesCondition/TrendLineControlPane.java
  27. 2
      designer_chart/src/com/fr/design/mainframe/MapArrayPane.java
  28. 4
      designer_chart/src/com/fr/design/module/ChartPreStyleManagerPane.java

1
designer/designer.iml

@ -17,5 +17,6 @@
<orderEntry type="module" module-name="designer_base" /> <orderEntry type="module" module-name="designer_base" />
<orderEntry type="module" module-name="engine" /> <orderEntry type="module" module-name="engine" />
<orderEntry type="library" name="lib" level="project" /> <orderEntry type="library" name="lib" level="project" />
<orderEntry type="module" module-name="plugins-free" />
</component> </component>
</module> </module>

4
designer/src/com/fr/design/present/ConditionAttributesGroupPane.java

@ -6,7 +6,7 @@ import java.util.List;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.general.NameObject; import com.fr.general.NameObject;
import com.fr.design.condition.HighLightConditionAttributesPane; import com.fr.design.condition.HighLightConditionAttributesPane;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.general.Inter; import com.fr.general.Inter;
@ -15,7 +15,7 @@ import com.fr.report.cell.cellattr.highlight.Highlight;
import com.fr.report.cell.cellattr.highlight.HighlightGroup; import com.fr.report.cell.cellattr.highlight.HighlightGroup;
import com.fr.stable.Nameable; import com.fr.stable.Nameable;
public class ConditionAttributesGroupPane extends JControlPane { public class ConditionAttributesGroupPane extends JListControlPane {
@Override @Override
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {

4
designer/src/com/fr/design/present/StyleArrayPane.java

@ -2,7 +2,7 @@ package com.fr.design.present;
import com.fr.base.Style; import com.fr.base.Style;
import com.fr.design.gui.controlpane.AbstractNameableCreator; import com.fr.design.gui.controlpane.AbstractNameableCreator;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.UnrepeatedNameHelper; import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.ListModelElement;
@ -18,7 +18,7 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
public class StyleArrayPane extends JControlPane { public class StyleArrayPane extends JListControlPane {
/** /**
* Constructor. * Constructor.

4
designer/src/com/fr/design/report/share/ConfusionManagerPane.java

@ -10,7 +10,7 @@ import java.util.List;
import com.fr.data.TableDataSource; import com.fr.data.TableDataSource;
import com.fr.data.impl.EmbeddedTableData; import com.fr.data.impl.EmbeddedTableData;
import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.ShortCut4JControlPane; import com.fr.design.gui.controlpane.ShortCut4JControlPane;
@ -23,7 +23,7 @@ import com.fr.general.NameObject;
* *
* @date: 2015-3-9-上午9:10:20 * @date: 2015-3-9-上午9:10:20
*/ */
public class ConfusionManagerPane extends JControlPane { public class ConfusionManagerPane extends JListControlPane {
/** /**
* 获取当前面板的编辑对象 * 获取当前面板的编辑对象

4
designer/src/com/fr/design/widget/WidgetConfigPane.java

@ -1,6 +1,6 @@
package com.fr.design.widget; package com.fr.design.widget;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.core.WidgetConstants; import com.fr.design.gui.core.WidgetConstants;
@ -17,7 +17,7 @@ import java.util.List;
/** /**
* Widget配置面板 * Widget配置面板
*/ */
public class WidgetConfigPane extends JControlPane { public class WidgetConfigPane extends JListControlPane {
/** /**
* 创建用户自定义widget组件 * 创建用户自定义widget组件

2
designer_base/designer_base.iml

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../../env/8.0/WebReport/WEB-INF/classes" /> <output url="file://E:/env/8.0/WebReport/WEB-INF/classes" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content> </content>

16
designer_base/src/com/fr/design/ExtraDesignClassManager.java

@ -126,7 +126,7 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
private DesignerEnvProcessor envProcessor; private DesignerEnvProcessor envProcessor;
private TableDataTreePaneProcessor tableDataTreePaneProcessor; private TableDataPaneProcessor tableDataPaneProcessor;
private Set<ElementUIProvider> elementUIProviders; private Set<ElementUIProvider> elementUIProviders;
@ -134,13 +134,13 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
private Set<ExportAttrTabProvider> exportAttrTabProviders; private Set<ExportAttrTabProvider> exportAttrTabProviders;
public TableDataTreePaneProcessor getTableDataTreePaneProcessor() { public TableDataPaneProcessor getTableDataPaneProcessor() {
return tableDataTreePaneProcessor; return tableDataPaneProcessor;
} }
public void setTableDataSourceOPProcessor(Level level, PluginSimplify simplify) { public void setTableDataPaneProcessor(Level level, PluginSimplify simplify) {
validAPILevel(level, TableDataTreePaneProcessor.CURRENT_LEVEL, simplify.getPluginName()); validAPILevel(level, TableDataPaneProcessor.CURRENT_LEVEL, simplify.getPluginName());
tableDataTreePaneProcessor = (TableDataTreePaneProcessor) level; tableDataPaneProcessor = (TableDataPaneProcessor) level;
} }
public DesignerEnvProcessor getEnvProcessor() { public DesignerEnvProcessor getEnvProcessor() {
@ -858,8 +858,8 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
addSupportDesignApps(impl, simplify); addSupportDesignApps(impl, simplify);
} else if (tagName.equals(DesignerEnvProcessor.XML_TAG)) { } else if (tagName.equals(DesignerEnvProcessor.XML_TAG)) {
setEnvProcessor(impl, simplify); setEnvProcessor(impl, simplify);
} else if (tagName.equals(TableDataTreePaneProcessor.XML_TAG)) { } else if (tagName.equals(TableDataPaneProcessor.XML_TAG)) {
setTableDataSourceOPProcessor(impl, simplify); setTableDataPaneProcessor(impl, simplify);
} else if (tagName.equals(ElementUIProvider.MARK_STRING)) { } else if (tagName.equals(ElementUIProvider.MARK_STRING)) {
addElementUIProvider(impl, simplify); addElementUIProvider(impl, simplify);
} else if (tagName.equals(WidgetPropertyUIProvider.XML_TAG)) { } else if (tagName.equals(WidgetPropertyUIProvider.XML_TAG)) {

24
designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java

@ -4,6 +4,9 @@
package com.fr.design.data.datapane; package com.fr.design.data.datapane;
import com.fr.data.TableDataSource; import com.fr.data.TableDataSource;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.fun.TableDataPaneProcessor;
import com.fr.design.gui.controlpane.JControlPane;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.frpane.LoadingBasicPane; import com.fr.design.gui.frpane.LoadingBasicPane;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
@ -19,19 +22,24 @@ import java.util.Map;
* 创建于2011-6-14 * 创建于2011-6-14
*/ */
public class ReportTableDataPane extends LoadingBasicPane { public class ReportTableDataPane extends LoadingBasicPane {
private TableDataListPane tdListPane; private JControlPane tdPane;
@Override @Override
protected void initComponents(JPanel container) { protected void initComponents(JPanel container) {
container.setLayout(FRGUIPaneFactory.createBorderLayout()); container.setLayout(FRGUIPaneFactory.createBorderLayout());
this.tdListPane = new TableDataListPane() { TableDataPaneProcessor paneProcessor = ExtraDesignClassManager.getInstance().getTableDataPaneProcessor();
JControlPane pane = null;
if (paneProcessor != null) {
pane = paneProcessor.createServerTableDataPane();
}
tdPane = pane == null ? new TableDataListPane() {
@Override @Override
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {
return TableDataCreatorProducer.getInstance().createReportTableDataCreator(); return TableDataCreatorProducer.getInstance().createReportTableDataCreator();
} }
}; } : pane;
container.add(tdListPane, BorderLayout.CENTER); container.add(tdPane, BorderLayout.CENTER);
} }
@Override @Override
@ -40,11 +48,11 @@ public class ReportTableDataPane extends LoadingBasicPane {
} }
public void populate(TableDataSource tds) { public void populate(TableDataSource tds) {
tdListPane.populate(tds); tdPane.populate(tds);
} }
public void update(TableDataSource tds) { public void update(TableDataSource tds) {
tdListPane.update(tds); tdPane.update(tds);
} }
/** /**
@ -53,10 +61,10 @@ public class ReportTableDataPane extends LoadingBasicPane {
* @throws Exception 异常 * @throws Exception 异常
*/ */
public void checkValid() throws Exception { public void checkValid() throws Exception {
this.tdListPane.checkValid(); this.tdPane.checkValid();
} }
public Map<String, String> getDsNameChangedMap() { public Map<String, String> getDsNameChangedMap() {
return tdListPane.getDsNameChangedMap(); return tdPane.getDsNameChangedMap();
} }
} }

6
designer_base/src/com/fr/design/data/datapane/TableDataListPane.java

@ -4,7 +4,7 @@ import com.fr.base.TableData;
import com.fr.data.TableDataSource; import com.fr.data.TableDataSource;
import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.data.impl.storeproc.StoreProcedure;
import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.DesignTableDataManager;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.ListModelElement;
import com.fr.file.DatasourceManagerProvider; import com.fr.file.DatasourceManagerProvider;
@ -21,9 +21,7 @@ import java.util.*;
/** /**
* TableDataList Pane. * TableDataList Pane.
*/ */
public class TableDataListPane extends JControlPane { public class TableDataListPane extends JListControlPane {
private Map<String, String> dsNameChangedMap = new HashMap<String, String>();
private boolean isNamePermitted = true;
public TableDataListPane() { public TableDataListPane() {
super(); super();

4
designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java

@ -14,7 +14,7 @@ import com.fr.design.data.tabledata.wrapper.AbstractTableDataWrapper;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.fun.TableDataTreePaneProcessor; import com.fr.design.fun.TableDataPaneProcessor;
import com.fr.design.gui.ibutton.UIHeadGroup; import com.fr.design.gui.ibutton.UIHeadGroup;
import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
@ -47,7 +47,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
public synchronized static BasicTableDataTreePane getInstance(DesignModelAdapter<?, ?> tc) { public synchronized static BasicTableDataTreePane getInstance(DesignModelAdapter<?, ?> tc) {
TableDataTreePaneProcessor treePaneProcessor = ExtraDesignClassManager.getInstance().getTableDataTreePaneProcessor(); TableDataPaneProcessor treePaneProcessor = ExtraDesignClassManager.getInstance().getTableDataPaneProcessor();
if (treePaneProcessor != null) { if (treePaneProcessor != null) {
return treePaneProcessor.createTableDataTreePane(tc); return treePaneProcessor.createTableDataTreePane(tc);
} }

4
designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java

@ -4,7 +4,7 @@ import com.fr.data.impl.Connection;
import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.impl.JDBCDatabaseConnection;
import com.fr.data.impl.JNDIDatabaseConnection; import com.fr.data.impl.JNDIDatabaseConnection;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.file.DatasourceManagerProvider; import com.fr.file.DatasourceManagerProvider;
@ -22,7 +22,7 @@ import java.util.*;
/** /**
* Connection List Pane. * Connection List Pane.
*/ */
public class ConnectionListPane extends JControlPane { public class ConnectionListPane extends JListControlPane {
public static final String TITLE_NAME = Inter.getLocText("Server-Define_Data_Connection"); public static final String TITLE_NAME = Inter.getLocText("Server-Define_Data_Connection");
private boolean isNamePermitted = true; private boolean isNamePermitted = true;
private HashMap<String, String> renameMap = new HashMap<String, String>(); private HashMap<String, String> renameMap = new HashMap<String, String>();

4
designer_base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java

@ -3,7 +3,7 @@ package com.fr.design.data.tabledata.tabledatapane;
import com.fr.data.TableDataSource; import com.fr.data.TableDataSource;
import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.data.impl.storeproc.StoreProcedure;
import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.DesignTableDataManager;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.ListModelElement;
@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
public class ProcedureListPane extends JControlPane { public class ProcedureListPane extends JListControlPane {
public ProcedureListPane() { public ProcedureListPane() {
super(); super();
this.addEditingListner(new PropertyChangeAdapter() { this.addEditingListner(new PropertyChangeAdapter() {

32
designer_base/src/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java

@ -1,7 +1,10 @@
package com.fr.design.data.tabledata.tabledatapane; package com.fr.design.data.tabledata.tabledatapane;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.data.datapane.TableDataListPane; import com.fr.design.data.datapane.TableDataListPane;
import com.fr.design.fun.TableDataPaneProcessor;
import com.fr.design.gui.controlpane.JControlPane;
import com.fr.design.gui.frpane.LoadingBasicPane; import com.fr.design.gui.frpane.LoadingBasicPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
@ -18,7 +21,7 @@ import java.util.Map;
public class TableDataManagerPane extends LoadingBasicPane { public class TableDataManagerPane extends LoadingBasicPane {
private UITextField tableDataTextField; private UITextField tableDataTextField;
private TableDataListPane tableDataListPane; private JControlPane tableDataPane;
@Override @Override
protected void initComponents(JPanel container) { protected void initComponents(JPanel container) {
@ -36,13 +39,18 @@ public class TableDataManagerPane extends LoadingBasicPane {
this.tableDataTextField = new UITextField(); this.tableDataTextField = new UITextField();
tableDataPathPane.add(tableDataTextField, BorderLayout.CENTER); tableDataPathPane.add(tableDataTextField, BorderLayout.CENTER);
this.tableDataTextField.setEditable(false); this.tableDataTextField.setEditable(false);
tableDataListPane = new TableDataListPane(){ TableDataPaneProcessor paneProcessor = ExtraDesignClassManager.getInstance().getTableDataPaneProcessor();
protected void rename(String oldName,String newName){ JControlPane pane = null;
super.rename(oldName,newName); if (paneProcessor != null) {
pane = paneProcessor.createServerTableDataPane();
}
tableDataPane = pane == null ? new TableDataListPane() {
protected void rename(String oldName, String newName) {
super.rename(oldName, newName);
renameConnection(oldName, newName); renameConnection(oldName, newName);
} }
}; } : pane;
container.add(tableDataListPane, BorderLayout.CENTER); container.add(tableDataPane, BorderLayout.CENTER);
} }
@ -51,7 +59,7 @@ public class TableDataManagerPane extends LoadingBasicPane {
* @return 是则返回true * @return 是则返回true
*/ */
public boolean isNamePermitted(){ public boolean isNamePermitted(){
return tableDataListPane.isNamePermitted(); return tableDataPane.isNamePermitted();
} }
/** /**
@ -59,7 +67,7 @@ public class TableDataManagerPane extends LoadingBasicPane {
* @throws Exception 异常 * @throws Exception 异常
*/ */
public void checkValid() throws Exception { public void checkValid() throws Exception {
tableDataListPane.checkValid(); tableDataPane.checkValid();
} }
@Override @Override
@ -70,15 +78,15 @@ public class TableDataManagerPane extends LoadingBasicPane {
public void populate(DatasourceManagerProvider datasourceManager) { public void populate(DatasourceManagerProvider datasourceManager) {
this.tableDataTextField.setText(FRContext.getCurrentEnv().getPath() + File.separator + ProjectConstants.RESOURCES_NAME this.tableDataTextField.setText(FRContext.getCurrentEnv().getPath() + File.separator + ProjectConstants.RESOURCES_NAME
+ File.separator + datasourceManager.fileName()); + File.separator + datasourceManager.fileName());
this.tableDataListPane.populate(datasourceManager); this.tableDataPane.populate(datasourceManager);
} }
public void update(DatasourceManagerProvider datasourceManager) { public void update(DatasourceManagerProvider datasourceManager) {
this.tableDataListPane.update(datasourceManager); this.tableDataPane.update(datasourceManager);
} }
public Map<String, String> getDsChangedNameMap () { public Map<String, String> getDsChangedNameMap () {
return this.tableDataListPane.getDsNameChangedMap(); return this.tableDataPane.getDsNameChangedMap();
} }
/** /**
@ -87,6 +95,6 @@ public class TableDataManagerPane extends LoadingBasicPane {
* @param index 选中项的序列号 * @param index 选中项的序列号
*/ */
public void setSelectedIndex(int index) { public void setSelectedIndex(int index) {
this.tableDataListPane.setSelectedIndex(index); this.tableDataPane.setSelectedIndex(index);
} }
} }

4
designer_base/src/com/fr/design/formula/FunctionManagerPane.java

@ -6,7 +6,7 @@ import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
@ -97,7 +97,7 @@ public class FunctionManagerPane extends BasicPane {
/** /**
* CellRenderer. * CellRenderer.
*/ */
class FunctionControlPane extends JControlPane { class FunctionControlPane extends JListControlPane {
public FunctionControlPane() { public FunctionControlPane() {
super(); super();

11
designer_base/src/com/fr/design/fun/TableDataTreePaneProcessor.java → designer_base/src/com/fr/design/fun/TableDataPaneProcessor.java

@ -2,6 +2,7 @@ package com.fr.design.fun;
import com.fr.design.DesignModelAdapter; import com.fr.design.DesignModelAdapter;
import com.fr.design.data.BasicTableDataTreePane; import com.fr.design.data.BasicTableDataTreePane;
import com.fr.design.gui.controlpane.JControlPane;
import com.fr.stable.fun.Level; import com.fr.stable.fun.Level;
/** /**
@ -10,8 +11,8 @@ import com.fr.stable.fun.Level;
* Date: 2016/4/18 * Date: 2016/4/18
* Time: 9:04 * Time: 9:04
*/ */
public interface TableDataTreePaneProcessor extends Level { public interface TableDataPaneProcessor extends Level {
String XML_TAG = "TableDataTreePaneProcessor"; String XML_TAG = "TableDataPaneProcessor";
int CURRENT_LEVEL = 1; int CURRENT_LEVEL = 1;
/** /**
@ -20,4 +21,10 @@ public interface TableDataTreePaneProcessor extends Level {
*/ */
BasicTableDataTreePane createTableDataTreePane(DesignModelAdapter<?, ?> tc); BasicTableDataTreePane createTableDataTreePane(DesignModelAdapter<?, ?> tc);
/**
* 服务器数据集面板(模板数据集面板)
* @return 服务器数据集面板
*/
JControlPane createServerTableDataPane();
} }

4
designer_base/src/com/fr/design/fun/impl/AbstractTDTreePaneProcessor.java → designer_base/src/com/fr/design/fun/impl/AbstractTDPaneProcessor.java

@ -1,13 +1,13 @@
package com.fr.design.fun.impl; package com.fr.design.fun.impl;
import com.fr.design.fun.TableDataTreePaneProcessor; import com.fr.design.fun.TableDataPaneProcessor;
/** /**
* Coder: zack * Coder: zack
* Date: 2016/4/18 * Date: 2016/4/18
* Time: 10:30 * Time: 10:30
*/ */
public abstract class AbstractTDTreePaneProcessor implements TableDataTreePaneProcessor { public abstract class AbstractTDPaneProcessor implements TableDataPaneProcessor {
@Override @Override
public int currentAPILevel() { public int currentAPILevel() {
return CURRENT_LEVEL; return CURRENT_LEVEL;

893
designer_base/src/com/fr/design/gui/controlpane/JControlPane.java

File diff suppressed because it is too large Load Diff

1028
designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java

File diff suppressed because it is too large Load Diff

2
designer_base/src/com/fr/design/gui/controlpane/ObjectJControlPane.java

@ -11,7 +11,7 @@ import com.fr.design.beans.BasicBeanPane;
* @author zhou * @author zhou
* @since 2012-4-5上午9:29:20 * @since 2012-4-5上午9:29:20
*/ */
public abstract class ObjectJControlPane extends JControlPane { public abstract class ObjectJControlPane extends JListControlPane {
private Object object; private Object object;
public ObjectJControlPane() { public ObjectJControlPane() {

4
designer_base/src/com/fr/design/gui/frpane/HyperlinkGroupPane.java

@ -4,7 +4,7 @@ import com.fr.design.ExtraDesignClassManager;
import com.fr.design.actions.HyperlinkPluginAction; import com.fr.design.actions.HyperlinkPluginAction;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.fun.HyperlinkProvider; import com.fr.design.fun.HyperlinkProvider;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.module.DesignModuleFactory; import com.fr.design.module.DesignModuleFactory;
import com.fr.general.Inter; import com.fr.general.Inter;
@ -25,7 +25,7 @@ import java.util.List;
* @author kunsnat E-mail:kunsnat@gmail.com * @author kunsnat E-mail:kunsnat@gmail.com
* @version 创建时间2013-6-25 上午11:17:57 * @version 创建时间2013-6-25 上午11:17:57
*/ */
public class HyperlinkGroupPane extends JControlPane { public class HyperlinkGroupPane extends JListControlPane {
/** /**
* 生成添加按钮的NameableCreator * 生成添加按钮的NameableCreator

4
designer_base/src/com/fr/design/parameter/ParameterArrayPane.java

@ -2,7 +2,7 @@ package com.fr.design.parameter;
import com.fr.base.ConfigManager; import com.fr.base.ConfigManager;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.NameableSelfCreator; import com.fr.design.gui.controlpane.NameableSelfCreator;
import com.fr.design.gui.controlpane.UnrepeatedNameHelper; import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
@ -18,7 +18,7 @@ import javax.swing.*;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
public class ParameterArrayPane extends JControlPane { public class ParameterArrayPane extends JListControlPane {
/** /**
* Constructor. * Constructor.
*/ */

4
designer_base/src/com/fr/env/EnvListPane.java vendored

@ -41,7 +41,7 @@ import com.fr.dav.LocalEnv;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.dialog.InformationWarnPane; import com.fr.design.dialog.InformationWarnPane;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.ipasswordfield.UIPassWordField; import com.fr.design.gui.ipasswordfield.UIPassWordField;
@ -63,7 +63,7 @@ import com.fr.stable.ProductConstants;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.core.PropertyChangeAdapter; import com.fr.stable.core.PropertyChangeAdapter;
public class EnvListPane extends JControlPane { public class EnvListPane extends JListControlPane {
public EnvListPane() { public EnvListPane() {
super(); super();
addEditingListner(new PropertyChangeAdapter() { addEditingListner(new PropertyChangeAdapter() {

4
designer_chart/src/com/fr/design/chart/ChartControlPane.java

@ -3,7 +3,7 @@ package com.fr.design.chart;
import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
@ -18,7 +18,7 @@ import java.util.HashMap;
* 管理图表类型Pane * 管理图表类型Pane
* @author kunsnat: ChartComponent移出. * @author kunsnat: ChartComponent移出.
*/ */
public class ChartControlPane extends JControlPane { public class ChartControlPane extends JListControlPane {
private static final long serialVersionUID = 7336270815128413184L; private static final long serialVersionUID = 7336270815128413184L;
public ChartControlPane() { public ChartControlPane() {

4
designer_chart/src/com/fr/design/chart/axis/ChartAlertLinePane.java

@ -4,14 +4,14 @@ import com.fr.general.Inter;
import com.fr.general.NameObject; import com.fr.general.NameObject;
import com.fr.stable.Nameable; import com.fr.stable.Nameable;
import com.fr.chart.chartattr.ChartAlertValue; import com.fr.chart.chartattr.ChartAlertValue;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class ChartAlertLinePane extends JControlPane { public class ChartAlertLinePane extends JListControlPane {
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {
return new NameableCreator[]{ return new NameableCreator[]{

4
designer_chart/src/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java

@ -7,7 +7,7 @@ import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionAttr; import com.fr.chart.chartglyph.ConditionAttr;
import com.fr.chart.chartglyph.ConditionCollection; import com.fr.chart.chartglyph.ConditionCollection;
import com.fr.design.chart.series.SeriesCondition.impl.DataSeriesConditionPaneFactory; import com.fr.design.chart.series.SeriesCondition.impl.DataSeriesConditionPaneFactory;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
@ -20,7 +20,7 @@ import java.util.List;
* *
* @see DataSeriesConditionPane * @see DataSeriesConditionPane
*/ */
public class DataSeriesAttrPane extends JControlPane { public class DataSeriesAttrPane extends JListControlPane {
private static final long serialVersionUID = -7265389532959632525L; private static final long serialVersionUID = -7265389532959632525L;
private Plot plot; private Plot plot;

4
designer_chart/src/com/fr/design/chart/series/SeriesCondition/TrendLineControlPane.java

@ -5,14 +5,14 @@ import com.fr.general.NameObject;
import com.fr.stable.Nameable; import com.fr.stable.Nameable;
import com.fr.chart.base.AttrTrendLine; import com.fr.chart.base.AttrTrendLine;
import com.fr.chart.base.ConditionTrendLine; import com.fr.chart.base.ConditionTrendLine;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class TrendLineControlPane extends JControlPane { public class TrendLineControlPane extends JListControlPane {
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {
return new NameableCreator[] { return new NameableCreator[] {

2
designer_chart/src/com/fr/design/mainframe/MapArrayPane.java

@ -32,7 +32,7 @@ import java.util.List;
* Date: 14/12/3 * Date: 14/12/3
* Time: 上午10:00 * Time: 上午10:00
*/ */
public class MapArrayPane extends JControlPane { public class MapArrayPane extends JListControlPane {
private static final int LEFT_WIDTH = 180; private static final int LEFT_WIDTH = 180;
private static final Color LINE_COLOR = new Color(176, 176, 176); private static final Color LINE_COLOR = new Color(176, 176, 176);
private static final int TOP_GAP = 5; private static final int TOP_GAP = 5;

4
designer_chart/src/com/fr/design/module/ChartPreStyleManagerPane.java

@ -4,7 +4,7 @@ import com.fr.base.ChartPreStyleManagerProvider;
import com.fr.base.ChartPreStyleServerManager; import com.fr.base.ChartPreStyleServerManager;
import com.fr.base.Utils; import com.fr.base.Utils;
import com.fr.chart.base.ChartPreStyle; import com.fr.chart.base.ChartPreStyle;
import com.fr.design.gui.controlpane.JControlPane; import com.fr.design.gui.controlpane.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
@ -22,7 +22,7 @@ import java.util.Iterator;
* @author kunsnat E-mail:kunsnat@gmail.com * @author kunsnat E-mail:kunsnat@gmail.com
* @version 创建时间2013-8-21 下午02:33:48 * @version 创建时间2013-8-21 下午02:33:48
*/ */
public class ChartPreStyleManagerPane extends JControlPane { public class ChartPreStyleManagerPane extends JListControlPane {
@Override @Override
/** /**

Loading…
Cancel
Save