Browse Source

根据插件建议修改下代码,主要是类注释和包import

feature/x
obo 1 year ago
parent
commit
60372dff48
  1. 11
      designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECPreviewPane.java
  2. 12
      designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECReportPreviewPane.java
  3. 9
      designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java
  4. 9
      designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
  5. 5
      designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java
  6. 2
      designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java
  7. 21
      designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java

11
designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECPreviewPane.java

@ -10,8 +10,11 @@ import com.fr.design.mainframe.theme.preview.ecpreview.AbstractECPreviewPane;
import com.fr.design.mainframe.theme.preview.ecpreview.cell.AbstractPreviewCell;
import com.fr.design.mainframe.theme.preview.ecpreview.cell.PreviewCell;
import javax.swing.*;
import java.awt.*;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridLayout;
import java.util.ArrayList;
import java.util.List;
@ -19,8 +22,8 @@ import java.util.List;
* 主题界面frm里的那个表格,做了简单修改,削减了几行重复内容,腾出控件参数面板的空间
*
* @author John.Ying
* @version 1.0
* Created by John.Ying on 2021/3/18
* @since 11.0
* Created on 2021/3/18
*/
public class WidgetThemeECPreviewPane extends AbstractECPreviewPane {
private final List<AbstractPreviewCell> headerCellList = new ArrayList<>();

12
designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetThemeECReportPreviewPane.java

@ -13,8 +13,12 @@ import com.fr.design.mainframe.theme.preview.ecpreview.cell.AbstractPreviewCell;
import com.fr.design.mainframe.theme.preview.ecpreview.cell.CornerPreviewCell;
import com.fr.design.mainframe.theme.preview.ecpreview.cell.PreviewCell;
import javax.swing.*;
import java.awt.*;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridLayout;
import java.awt.Point;
import java.awt.geom.Point2D;
import java.util.ArrayList;
import java.util.List;
@ -23,8 +27,8 @@ import java.util.List;
* 主题界面report里的那个表格,做了简单修改,削减了几行重复内容,腾出控件参数面板的空间
*
* @author John.Ying
* @version 1.0
* Created by John.Ying on 2021/3/18
* @since 1.0
* Created on 2021/3/18
*/
public class WidgetThemeECReportPreviewPane extends UINoOpaquePanel implements ThemePreviewed<ReportTheme> {
private final List<AbstractPreviewCell> headerTitleCellList = new ArrayList<>(); // 大标题样式单元格

9
designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@ -40,8 +40,13 @@ import com.fr.plugin.observer.PluginEvent;
import com.fr.plugin.observer.PluginEventListener;
import com.fr.report.stable.FormConstants;
import javax.swing.*;
import java.awt.*;
import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

9
designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@ -24,11 +24,16 @@ import com.fr.form.ui.DateEditor;
import com.fr.stable.ArrayUtils;
import com.fr.stable.collections.CollectionUtils;
import javax.swing.*;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import javax.swing.border.TitledBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.BorderLayout;
import java.awt.CardLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.SimpleDateFormat;

5
designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

@ -19,8 +19,9 @@ import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
import com.fr.stable.collections.CollectionUtils;
import javax.swing.*;
import java.awt.*;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import java.awt.Component;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.util.Set;

2
designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java

@ -12,7 +12,7 @@ import java.util.Collections;
* 设计器控件属性的高级设置增加主题样式设置项用于标签控件
*
* @author obo
* @version 11.0
* @since 11.0
* Created on 2023/11/13
*/
public class LabelSettingPane<T extends Widget> extends BaseStyleSettingPane<T> {

21
designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java

@ -65,14 +65,10 @@ public class WidgetThemeCreatorPaneAcceptor<T> {
private void acceptEditor(Class creator, List<BasicBeanPane<T>> extraPaneList) {
boolean accept = WidgetThemeDesignerUtils.enableWidgetEnhance()
&& (creator == TextArea.class
|| creator == TextEditor.class
|| creator == NumberEditor.class
|| creator == Password.class
|| creator == ComboBox.class
|| creator == ComboCheckBox.class
|| creator == DateEditor.class
|| creator == TreeComboBoxEditor.class)
&& (creator == TextArea.class || creator == TextEditor.class
|| creator == NumberEditor.class || creator == Password.class
|| creator == ComboBox.class || creator == ComboCheckBox.class
|| creator == DateEditor.class || creator == TreeComboBoxEditor.class)
|| WidgetThemeDesignerUtils.isNewComboBoxTreeEditor(creator);
if (accept) {
insertShortCut(extraPaneList, new EditorSettingPane<>());
@ -97,12 +93,9 @@ public class WidgetThemeCreatorPaneAcceptor<T> {
private void acceptNormal(Class creator, List<BasicBeanPane<T>> extraPaneList) {
boolean accept = WidgetThemeDesignerUtils.enableWidgetEnhance()
&& (creator == AppendRowButton.class
|| creator == FreeButton.class
|| creator == DeleteRowButton.class
|| creator == FormSubmitButton.class
|| creator == TreeNodeToggleButton.class
|| creator == Button.class);
&& (creator == AppendRowButton.class || creator == FreeButton.class
|| creator == DeleteRowButton.class || creator == FormSubmitButton.class
|| creator == TreeNodeToggleButton.class || creator == Button.class);
if (accept) {
insertShortCut(extraPaneList, new NormalButtonSettingPane<>());
}

Loading…
Cancel
Save