Browse Source

Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0

final/10.0
Mata.Li 6 years ago
parent
commit
75d5efe8ae
  1. 16
      designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java
  2. 19
      designer-base/src/main/java/com/fr/design/fun/Feedback.java
  3. 3
      designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
  4. 10
      designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java
  5. 2
      designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

16
designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java

@ -7,7 +7,6 @@ package com.fr.design;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.design.data.datapane.TableDataNameObjectCreator; import com.fr.design.data.datapane.TableDataNameObjectCreator;
import com.fr.design.fun.CellWidgetOptionProvider; import com.fr.design.fun.CellWidgetOptionProvider;
import com.fr.design.fun.Feedback;
import com.fr.design.fun.FormWidgetOptionProvider; import com.fr.design.fun.FormWidgetOptionProvider;
import com.fr.design.fun.ParameterWidgetOptionProvider; import com.fr.design.fun.ParameterWidgetOptionProvider;
import com.fr.design.fun.ServerTableDataDefineProvider; import com.fr.design.fun.ServerTableDataDefineProvider;
@ -19,8 +18,6 @@ import com.fr.design.menu.ShortCut;
import com.fr.design.widget.Appearance; import com.fr.design.widget.Appearance;
import com.fr.design.widget.mobile.WidgetMobilePane; import com.fr.design.widget.mobile.WidgetMobilePane;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
import com.fr.general.FRLogger;
import com.fr.general.GeneralUtils;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
import com.fr.plugin.AbstractExtraClassManager; import com.fr.plugin.AbstractExtraClassManager;
import com.fr.plugin.injectable.PluginModule; import com.fr.plugin.injectable.PluginModule;
@ -210,19 +207,6 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
return map; return map;
} }
public Feedback getFeedback() {
try {
Class clazz = GeneralUtils.classForName("com.fr.design.feedback.CurrentFeedback");
if (clazz != null) {
return (Feedback) clazz.newInstance();
}
} catch (Exception e) {
FRLogger.getLogger().info("no feed back support");
}
return Feedback.EMPTY;
}
@Override @Override
protected boolean demountSpecific(PluginSingleInjection injection) { protected boolean demountSpecific(PluginSingleInjection injection) {

19
designer-base/src/main/java/com/fr/design/fun/Feedback.java

@ -1,19 +0,0 @@
package com.fr.design.fun;
/**
* @author richie
* @date 2015-03-31
* @since 8.0
*/
public interface Feedback {
String MARK_STRING = "FineReport_Feedback";
void didFeedback();
Feedback EMPTY = new Feedback() {
@Override
public void didFeedback() {
}
};
}

3
designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java

@ -249,7 +249,8 @@ abstract class UIControlPane extends JControlPane {
checkValid(); checkValid();
} catch (Exception exp) { } catch (Exception exp) {
// 存在非法输入 拒绝隐藏 // 存在非法输入 拒绝隐藏
JOptionPane.showMessageDialog(UIControlPane.this.controlUpdatePane, exp.getMessage()); this.setAlwaysOnTop(true);
JOptionPane.showMessageDialog(this, exp.getMessage());
this.requestFocus(); this.requestFocus();
return; return;
} }

10
designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java

@ -12,7 +12,7 @@ import javax.swing.BorderFactory;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import java.awt.Component; import java.awt.Component;
import java.awt.FlowLayout; import java.awt.BorderLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -54,11 +54,11 @@ public abstract class AbstractExtendedChartReportDataPane<T extends AbstractData
Arrays.fill(rowSize, p); Arrays.fill(rowSize, p);
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 24, 6);
panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15)); panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 8));
this.setLayout(new FlowLayout()); this.setLayout(new BorderLayout());
this.add(panel); this.add(panel, BorderLayout.CENTER);
this.add(addSouthPane()); this.add(addSouthPane(), BorderLayout.SOUTH);
} }
protected JPanel addSouthPane() { protected JPanel addSouthPane() {

2
designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@ -170,8 +170,6 @@ public class DesignerActivator extends Activator {
designerRegister(); designerRegister();
InformationCollector.getInstance().collectStartTime(); InformationCollector.getInstance().collectStartTime();
ExtraDesignClassManager.getInstance().getFeedback().didFeedback();
} }
private static void preLoadPane() { private static void preLoadPane() {

Loading…
Cancel
Save