fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0

research/10.0
plough 6 years ago
parent
725a6389fb 889bd35298
commit
9ac6e23572
14 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      designer-base/src/main/java/com/fr/design/report/fit/FitType.java
  2. 8
      designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java
  3. 2
      designer-base/src/main/java/com/fr/design/report/fit/menupane/FitPreviewPane.java
  4. 2
      designer-base/src/main/java/com/fr/design/report/fit/menupane/FitRadioGroup.java
  5. 2
      designer-base/src/main/java/com/fr/design/report/fit/menupane/FontRadioGroup.java
  6. 6
      designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java
  7. 4
      designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java
  8. 6
      designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java
  9. 4
      designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java
  10. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
  11. 2
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java
  12. 2
      designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitAlignmentItems.java
  13. 4
      designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java
  14. 2
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

4
designer-base/src/main/java/com/fr/design/reportfit/FitType.java → designer-base/src/main/java/com/fr/design/report/fit/FitType.java
Unescape View File

@ -1,7 +1,7 @@
package com.fr.design.reportfit; package com.fr.design.report.fit;
import com.fr.design.designer.properties.items.Item; import com.fr.design.designer.properties.items.Item;
import com.fr.report.reportfit.ReportFitAttr; import com.fr.report.fit.ReportFitAttr;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
/** /**

8
designer-base/src/main/java/com/fr/design/reportfit/menupane/BrowserFitAttrPane.java → designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.reportfit.menupane; package com.fr.design.report.fit.menupane;
import com.fr.design.reportfit.FitType; import com.fr.design.report.fit.FitType;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ibutton.UIRadioButton;
@ -10,8 +10,8 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.report.reportfit.ReportFitAttr; import com.fr.report.fit.ReportFitAttr;
import com.fr.reportfit.ReportFitConfig; import com.fr.report.fit.ReportFitConfig;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.ButtonGroup; import javax.swing.ButtonGroup;

2
designer-base/src/main/java/com/fr/design/reportfit/menupane/FitPreviewPane.java → designer-base/src/main/java/com/fr/design/report/fit/menupane/FitPreviewPane.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.design.reportfit.menupane; package com.fr.design.report.fit.menupane;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;

2
designer-base/src/main/java/com/fr/design/reportfit/menupane/FitRadioGroup.java → designer-base/src/main/java/com/fr/design/report/fit/menupane/FitRadioGroup.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.design.reportfit.menupane; package com.fr.design.report.fit.menupane;
import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ibutton.UIRadioButton;

2
designer-base/src/main/java/com/fr/design/reportfit/menupane/FontRadioGroup.java → designer-base/src/main/java/com/fr/design/report/fit/menupane/FontRadioGroup.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.design.reportfit.menupane; package com.fr.design.report.fit.menupane;
/** /**
* 字体的两个选项组成的group * 字体的两个选项组成的group

6
designer-base/src/main/java/com/fr/design/reportfit/menupane/ReportFitAttrAction.java → designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java
Unescape View File

@ -1,4 +1,4 @@
package com.fr.design.reportfit.menupane; package com.fr.design.report.fit.menupane;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.design.actions.JTemplateAction; import com.fr.design.actions.JTemplateAction;
@ -8,8 +8,8 @@ import com.fr.design.dialog.UIDialog;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.menu.MenuKeySet; import com.fr.design.menu.MenuKeySet;
import com.fr.report.reportfit.FitProvider; import com.fr.report.fit.FitProvider;
import com.fr.report.reportfit.ReportFitAttr; import com.fr.report.fit.ReportFitAttr;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import java.awt.Dimension; import java.awt.Dimension;

4
designer-base/src/main/java/com/fr/design/reportfit/menupane/ReportFitAttrPane.java → designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java
Unescape View File

@ -1,7 +1,7 @@
package com.fr.design.reportfit.menupane; package com.fr.design.report.fit.menupane;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.report.reportfit.ReportFitAttr; import com.fr.report.fit.ReportFitAttr;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.BoxLayout; import javax.swing.BoxLayout;

6
designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateBrowserFitAttrPane.java → designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java
Unescape View File

@ -1,9 +1,9 @@
package com.fr.design.reportfit.menupane; package com.fr.design.report.fit.menupane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.report.reportfit.ReportFitAttr; import com.fr.report.fit.ReportFitAttr;
import com.fr.reportfit.ReportFitConfig; import com.fr.report.fit.ReportFitConfig;
import java.awt.Component; import java.awt.Component;

4
designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateFitAttrPane.java → designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java
Unescape View File

@ -1,7 +1,7 @@
package com.fr.design.reportfit.menupane; package com.fr.design.report.fit.menupane;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.report.reportfit.ReportFitAttr; import com.fr.report.fit.ReportFitAttr;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.BoxLayout; import javax.swing.BoxLayout;

4
designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
Unescape View File

@ -19,11 +19,11 @@ import com.fr.form.FormProvider;
import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.ElementCaseEditor;
import com.fr.form.ui.ElementCaseEditorProvider; import com.fr.form.ui.ElementCaseEditorProvider;
import com.fr.report.reportfit.ReportFitAttr; import com.fr.report.fit.ReportFitAttr;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.CoreGraphHelper; import com.fr.stable.CoreGraphHelper;
import com.fr.stable.core.PropertyChangeAdapter; import com.fr.stable.core.PropertyChangeAdapter;
import com.fr.report.reportfit.FitProvider; import com.fr.report.fit.FitProvider;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;

2
designer-form/src/main/java/com/fr/design/mainframe/JForm.java
Unescape View File

@ -35,7 +35,7 @@ import com.fr.design.mainframe.actions.EmbeddedFormExportExportAction;
import com.fr.design.mainframe.actions.TemplateParameterAction; import com.fr.design.mainframe.actions.TemplateParameterAction;
import com.fr.design.mainframe.form.FormECCompositeProvider; import com.fr.design.mainframe.form.FormECCompositeProvider;
import com.fr.design.mainframe.form.FormECDesignerProvider; import com.fr.design.mainframe.form.FormECDesignerProvider;
import com.fr.design.reportfit.menupane.ReportFitAttrAction; import com.fr.design.report.fit.menupane.ReportFitAttrAction;
import com.fr.design.mainframe.templateinfo.JFormProcessInfo; import com.fr.design.mainframe.templateinfo.JFormProcessInfo;
import com.fr.design.mainframe.templateinfo.TemplateProcessInfo; import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
import com.fr.design.mainframe.toolbar.ToolBarMenuDock; import com.fr.design.mainframe.toolbar.ToolBarMenuDock;

2
designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitAlignmentItems.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.mainframe.widget.propertypane; package com.fr.design.mainframe.widget.propertypane;
import com.fr.design.reportfit.FitType; import com.fr.design.report.fit.FitType;
import com.fr.design.designer.properties.items.Item; import com.fr.design.designer.properties.items.Item;
import com.fr.design.designer.properties.items.ItemProvider; import com.fr.design.designer.properties.items.ItemProvider;

4
designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java
Unescape View File

@ -2,8 +2,8 @@ package com.fr.design.mainframe.widget.propertypane;
import com.fr.design.designer.creator.CRPropertyDescriptor; import com.fr.design.designer.creator.CRPropertyDescriptor;
import com.fr.design.form.util.XCreatorConstants; import com.fr.design.form.util.XCreatorConstants;
import com.fr.report.reportfit.ReportFitAttr; import com.fr.report.fit.ReportFitAttr;
import com.fr.reportfit.ReportFitConfig; import com.fr.report.fit.ReportFitConfig;
import java.beans.IntrospectionException; import java.beans.IntrospectionException;

2
designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
Unescape View File

@ -41,7 +41,7 @@ import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIModeControlContainer; import com.fr.design.gui.icontainer.UIModeControlContainer;
import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.mainframe.cell.QuickEditorRegion; import com.fr.design.mainframe.cell.QuickEditorRegion;
import com.fr.design.reportfit.menupane.ReportFitAttrAction; import com.fr.design.report.fit.menupane.ReportFitAttrAction;
import com.fr.design.mainframe.templateinfo.JWorkBookProcessInfo; import com.fr.design.mainframe.templateinfo.JWorkBookProcessInfo;
import com.fr.design.mainframe.templateinfo.TemplateProcessInfo; import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;

Write Preview
Loading…
Cancel
Save