Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

REPORT-8709 and REPORT-8763

master
Mata.Li 6 years ago
parent
d6456a981a
commit
0d8e3a3256
11 changed files with 59 additions and 135 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      .gitignore
  2. 12
      designer-base/src/com/fr/design/data/datapane/connect/ConnectionManagerPane.java
  3. 10
      designer-base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java
  4. 9
      designer-base/src/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java
  5. 12
      designer-base/src/com/fr/design/formula/FunctionManagerPane.java
  6. 10
      designer-base/src/com/fr/design/parameter/ParameterManagerPane.java
  7. 100
      designer-chart/src/com/fr/design/ChartTypeInterfaceManager.java
  8. 4
      designer-form/src/com/fr/design/mainframe/FormParaWidgetPane.java
  9. 9
      designer-realize/src/com/fr/design/actions/server/StyleManagerPane.java
  10. 12
      designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java
  11. 11
      designer-realize/src/com/fr/design/webattr/WidgetManagerPane.java

5
.gitignore vendored
Unescape View File

@ -3,5 +3,10 @@
.DS_Store
.classpath
.project
target/
${web-inf-path}/
assets/
lib/
logs/

12
designer-base/src/com/fr/design/data/datapane/connect/ConnectionManagerPane.java
Unescape View File

@ -12,21 +12,11 @@ import java.awt.*;
import java.util.HashMap;
public class ConnectionManagerPane extends LoadingBasicPane implements ConnectionShowPane {
private UITextField connectionTextField;
private ConnectionListPane connectionListPane;
protected void initComponents(JPanel container) {
container.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel connectionPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
container.add(connectionPathPane, BorderLayout.NORTH);
connectionPathPane.setBorder(BorderFactory.createEmptyBorder(6, 2, 2, 2));
connectionPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
this.connectionTextField = new UITextField();
connectionPathPane.add(connectionTextField, BorderLayout.CENTER);
this.connectionTextField.setEditable(false);
connectionListPane = new ConnectionListPane() {
protected void rename(String oldName, String newName) {
super.rename(oldName, newName);

10
designer-base/src/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java
Unescape View File

@ -11,21 +11,11 @@ import javax.swing.*;
import java.awt.*;
public class ProcedureManagerPane extends LoadingBasicPane {
private UITextField connectionTextField;
private ProcedureListPane procedureListPane;
protected void initComponents(JPanel container) {
container.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel connectionPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
container.add(connectionPathPane, BorderLayout.NORTH);
connectionPathPane.setBorder(BorderFactory.createEmptyBorder(6, 2, 2, 2));
connectionPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
this.connectionTextField = new UITextField();
connectionPathPane.add(connectionTextField, BorderLayout.CENTER);
this.connectionTextField.setEditable(false);
procedureListPane = new ProcedureListPane();
container.add(procedureListPane, BorderLayout.CENTER);
}

9
designer-base/src/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java
Unescape View File

@ -18,7 +18,6 @@ import java.util.Map;
public class TableDataManagerPane extends LoadingBasicPane {
private UITextField tableDataTextField;
private TableDataPaneController tableDataPane;
@Override
@ -29,14 +28,6 @@ public class TableDataManagerPane extends LoadingBasicPane {
private void initTableDataManagerPane(JPanel container) {
container.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel tableDataPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
container.add(tableDataPathPane, BorderLayout.NORTH);
tableDataPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
this.tableDataTextField = new UITextField();
tableDataPathPane.add(tableDataTextField, BorderLayout.CENTER);
this.tableDataTextField.setEditable(false);
TableDataPaneProcessor paneProcessor = ExtraDesignClassManager.getInstance().getSingle(TableDataPaneProcessor.XML_TAG);
TableDataPaneController pane = null;
if (paneProcessor != null) {

12
designer-base/src/com/fr/design/formula/FunctionManagerPane.java
Unescape View File

@ -33,23 +33,11 @@ import java.util.List;
public class FunctionManagerPane extends BasicPane {
private UITextField functionTextField;
private FunctionControlPane functionControlPane;
public FunctionManagerPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
//path pane
JPanel datasourcePathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
this.add(datasourcePathPane, BorderLayout.NORTH);
datasourcePathPane.add(new UILabel(Inter.getLocText(
"Function-Function_File") + ":"), BorderLayout.WEST);
this.functionTextField = new UITextField();
datasourcePathPane.add(this.functionTextField, BorderLayout.CENTER);
this.functionTextField.setEditable(false);
functionControlPane = new FunctionControlPane();
this.add(functionControlPane, BorderLayout.CENTER);
}

10
designer-base/src/com/fr/design/parameter/ParameterManagerPane.java
Unescape View File

@ -13,21 +13,11 @@ import java.awt.*;
public class ParameterManagerPane extends BasicPane {
private UITextField parameterTextField;
private ParameterArrayPane parameterArrayPane;
public ParameterManagerPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel parameterPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
this.add(parameterPathPane, BorderLayout.NORTH);
parameterPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
this.parameterTextField = new UITextField();
parameterPathPane.add(parameterTextField, BorderLayout.CENTER);
this.parameterTextField.setEditable(false);
parameterArrayPane = new ParameterArrayPane();
this.add(parameterArrayPane, BorderLayout.CENTER);
}

100
designer-chart/src/com/fr/design/ChartTypeInterfaceManager.java
Unescape View File

@ -109,23 +109,23 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
private static ChartTypeInterfaceManager classManager = new ChartTypeInterfaceManager();
private static LinkedHashMap<String, CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>> chartTypeInterfaces =
new LinkedHashMap<String, CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>>();
new LinkedHashMap<String, CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>>();
private static Map<String, String> idAndPriorityMap = new HashMap<String, String>();
public synchronized static ChartTypeInterfaceManager getInstance() {
DesignModuleFactory.registerExtraWidgetOptions(initWidgetOption());
return classManager;
}
static {
readDefault();
readVanChart();
PluginModule.registerAgent(PluginModule.ExtraChartDesign, classManager);
}
static {
GeneralContext.addEnvChangedListener(new EnvChangedListener() {
@ -138,7 +138,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
}
});
}
private static WidgetOption[] initWidgetOption() {
ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
@ -153,7 +153,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
Icon icon = IOUtils.readIcon(iconPath);
child[i] = new ChartWidgetOption(Inter.getLocText(typeName[i].getName()), icon, ChartEditor.class, rowChart[0]);
allCharts[i] = rowChart;
}
@ -168,10 +168,10 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
return child;
}
//加载所有图表图片
private static void initAllChartsDemoImage(Chart[][] allCharts) {
for (Chart[] rowChart : allCharts) {
if (rowChart == null) {
continue;
@ -180,9 +180,9 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
initChartsDemoImage(rowChart);
}
}
private static void initChartsDemoImage(Chart[] rowChart) {
for (Chart aRowChart : rowChart) {
//此时，为图片生成模型数据
aRowChart.createSlotImage();
@ -214,10 +214,10 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartGanttPlot.VAN_CHART_GANTT_PLOT_ID, new GanttIndependentVanChartInterface());
addChartTypeInterface(VAN_CHART_PRIORITY, VanChartStructurePlot.STRUCTURE_PLOT_ID, new StructureIndependentVanChartInterface());
}
private static void readDefault() {
if (chartTypeInterfaces.containsKey(CHART_PRIORITY)) {
return;
}
@ -240,14 +240,14 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
addChartTypeInterface(CHART_PRIORITY, ChartConstants.GIS_CHAER, new GisMapIndependentChartInterface());
addChartTypeInterface(CHART_PRIORITY, ChartConstants.FUNNEL_CHART, new FunnelIndependentChartInterface());
}
private static void addChartTypeInterface(String priority, String plotID, IndependentChartUIProvider provider) {
if (chartTypeInterfaces != null) {
if (!chartTypeInterfaces.containsKey(priority)) {
//新建一个具体图表列表
CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap> chartUIList
= new CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>(LinkedHashMap.class);
= new CloseableContainedMap<String, IndependentChartUIProvider, LinkedHashMap>(LinkedHashMap.class);
chartUIList.put(plotID, provider);
chartTypeInterfaces.put(priority, chartUIList);
} else {
@ -269,14 +269,14 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
}
return null;
}
/**
* 把所有的pane加到list里
*
* @param paneList pane容器
*/
public void addPlotTypePaneList(List<FurtherBasicBeanPane<? extends Chart>> paneList) {
List<Integer> priorityList = getPriorityInOrder();
for (Integer aPriorityList : priorityList) {
String priority = String.valueOf(aPriorityList);
@ -335,17 +335,17 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
return list.toArray(new String[list.size()]);
}
/**
* 获取指定图表的标题
*/
public String getTitle4PopupWindow(String priority, String plotID) {
if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(priority) && chartTypeInterfaces.get(priority).containsKey(plotID)) {
IndependentChartUIProvider provider = chartTypeInterfaces.get(priority).get(plotID);
return getChartName(plotID, provider);
}
//兼容老的插件
if (chartTypeInterfaces != null) {
Iterator iterator = chartTypeInterfaces.entrySet().iterator();
@ -359,9 +359,9 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
}
return StringUtils.EMPTY;
}
private List<Integer> getPriorityInOrder() {
List<Integer> priorityList = new ArrayList<Integer>();
if (chartTypeInterfaces != null) {
Iterator iterator = chartTypeInterfaces.entrySet().iterator();
@ -384,7 +384,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
}
return StringUtils.EMPTY;
}
public ChartDataPane getChartDataPane(String plotID, AttributeChangeListener listener) {
IndependentChartUIProvider provider = getChartTypeInterface(plotID);
if (provider != null) {
@ -393,19 +393,19 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
return new ChartDataPane(listener);
}
/**
* 获取对应ID的图表数量
*
*/
private int getChartSize(String key) {
if (chartTypeInterfaces != null && chartTypeInterfaces.containsKey(key)) {
return chartTypeInterfaces.get(key).size();
}
return 0;
}
public AbstractChartAttrPane[] getAttrPaneArray(String plotID, AttributeChangeListener listener) {
IndependentChartUIProvider provider = getChartTypeInterface(plotID);
if (provider != null) {
@ -413,9 +413,9 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
}
return new AbstractChartAttrPane[0];
}
public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) {
IndependentChartUIProvider provider = getChartTypeInterface(plot.getPlotID());
@ -425,7 +425,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
return null;
}
public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) {
IndependentChartUIProvider provider = getChartTypeInterface(plot.getPlotID());
@ -435,15 +435,15 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
return null;
}
private boolean plotInChart(String plotID, String priority) {
return chartTypeInterfaces != null
&& chartTypeInterfaces.containsKey(priority)
&& chartTypeInterfaces.get(priority).containsKey(plotID);
&& chartTypeInterfaces.containsKey(priority)
&& chartTypeInterfaces.get(priority).containsKey(plotID);
}
public ConditionAttributesPane getPlotConditionPane(Plot plot) {
IndependentChartUIProvider provider = getChartTypeInterface(plot.getPlotID());
@ -453,7 +453,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
return null;
}
public BasicBeanPane<Plot> getPlotSeriesPane(ChartStylePane parent, Plot plot) {
IndependentChartUIProvider provider = getChartTypeInterface(plot.getPlotID());
@ -463,7 +463,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
return null;
}
/**
* 是否使用默认的界面，为了避免界面来回切换
*
@ -476,7 +476,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
if (provider != null) {
return provider.isUseDefaultPane();
}
return true;
}
@ -490,10 +490,10 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
return true;
}
@Override
public void mount(PluginSingleInjection injection) {
if (isIndependentChartUIProvider(injection)) {
String priority = injection.getAttribute("priority", CHART_PRIORITY);
String plotID = injection.getAttribute("plotID");
@ -501,20 +501,20 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
addChartTypeInterface(priority, plotID, instance);
}
}
@Override
public void demount(PluginSingleInjection injection) {
if (isIndependentChartUIProvider(injection)) {
String priority = injection.getAttribute("priority", CHART_PRIORITY);
String plotID = injection.getAttribute("plotID");
removeChartTypeInterface(priority, plotID);
}
}
private void removeChartTypeInterface(String priority, String plotID) {
if (chartTypeInterfaces != null) {
if (chartTypeInterfaces.containsKey(priority)) {
Map<String, IndependentChartUIProvider> chartUIList = chartTypeInterfaces.get(priority);
@ -522,10 +522,10 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
}
}
}
private boolean isIndependentChartUIProvider(PluginSingleInjection injection) {
return !(injection == null || injection.getObject() == null) && IndependentChartUIProvider.XML_TAG.equals(injection.getName()) && injection.getObject() instanceof IndependentChartUIProvider;
}

4
designer-form/src/com/fr/design/mainframe/FormParaWidgetPane.java
Unescape View File

@ -318,8 +318,8 @@ public class FormParaWidgetPane extends JPanel {
public void mouseClicked(MouseEvent e) {
initWidgetTypePopUp();
widgetTypePopupMenu.show(FormParaWidgetPane.this,
(int) jSeparatorChart.getLocation().getX() + BORDER,
(int) jSeparatorChart.getLocation().getY());
(int) jSeparatorLayout.getLocation().getX() + BORDER,
(int) jSeparatorLayout.getLocation().getY());
}
});

9
designer-realize/src/com/fr/design/actions/server/StyleManagerPane.java
Unescape View File

@ -12,20 +12,11 @@ import javax.swing.*;
import java.awt.*;
public class StyleManagerPane extends BasicPane {
private UITextField StyleTextField;
private StyleArrayPane styleArrayPane;
public StyleManagerPane(){
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel stylePathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
this.add(stylePathPane, BorderLayout.NORTH);
stylePathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
this.StyleTextField = new UITextField();
stylePathPane.add(StyleTextField, BorderLayout.CENTER);
this.StyleTextField.setEditable(false);
styleArrayPane = new StyleArrayPane();
this.add(styleArrayPane, BorderLayout.CENTER);
}

12
designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java
Unescape View File

@ -24,7 +24,6 @@ import java.awt.*;
* Edit Report Server Parameter.
*/
public class EditReportServerParameterPane extends LoadingBasicPane {
private UITextField configFileTextField;
private UITabbedPane tabbedPane;
@ -50,17 +49,6 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
JPanel defaultPane = container;
defaultPane.setLayout(FRGUIPaneFactory.createBorderLayout());
//path pane
JPanel datasourcePathPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
defaultPane.add(datasourcePathPane, BorderLayout.NORTH);
datasourcePathPane.add(GUICoreUtils.createFlowPane(new Component[] {
new UILabel(Inter.getLocText(
"ReportServerP-Report_server_parameter") + ":"),
(this.configFileTextField = new UITextField(40))
}, FlowLayout.LEFT), BorderLayout.WEST);
this.configFileTextField.setEditable(false);
//Tabbed Pane
tabbedPane = new UITabbedPane();
defaultPane.add(tabbedPane, BorderLayout.CENTER);

11
designer-realize/src/com/fr/design/webattr/WidgetManagerPane.java
Unescape View File

@ -15,22 +15,13 @@ import java.awt.*;
import java.io.File;
public class WidgetManagerPane extends LoadingBasicPane {
private UITextField widgetTextField;
private WidgetConfigPane widgetConfigPane;
@Override
protected void initComponents(JPanel container) {
container.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel widgetPathPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
container.add(widgetPathPane, BorderLayout.NORTH);
widgetPathPane.add(new UILabel(Inter.getLocText("FR-Designer_Save_Path") + ":"), BorderLayout.WEST);
this.widgetTextField = new UITextField();
widgetPathPane.add(widgetTextField, BorderLayout.CENTER);
this.widgetTextField.setEditable(false);
widgetConfigPane = new WidgetConfigPane();
container.add(widgetConfigPane, BorderLayout.CENTER);
}

Write Preview
Loading…
Cancel
Save