diff --git a/doc/cron-ui-cs.exe b/doc/cron-ui-cs.exe new file mode 100644 index 0000000..73d6817 Binary files /dev/null and b/doc/cron-ui-cs.exe differ diff --git a/pom.xml b/pom.xml index cba081c..ae8cd3f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ exp.cron cron-expression - 1.0-SNAPSHOT + 1.0 jar cron表达式配置工具 @@ -148,6 +148,17 @@ + + 拷贝web页面文件 + + + + + 拷贝界面启动文件 + + diff --git a/src/main/java/exp/cron/ui/CronUI.java b/src/main/java/exp/cron/ui/CronUI.java index 95a9fd4..0ed969b 100644 --- a/src/main/java/exp/cron/ui/CronUI.java +++ b/src/main/java/exp/cron/ui/CronUI.java @@ -27,9 +27,9 @@ public class CronUI extends MainWindow { protected final static String SECOND = "秒", MINUTE = "分", HOUR = "时", DAY = "日期", MONTH = "月份", WEEK = "星期", YEAR = "年份"; - private final static int WIDTH = 800; + private final static int WIDTH = 920; - private final static int HEIGHT = 680; + private final static int HEIGHT = 740; private Cron cron; @@ -91,7 +91,7 @@ protected void initComponents(Object... args) { tfWeek.setEditable(false); tfYear.setEditable(false); - this.copyBtn = new JButton("复制"); + this.copyBtn = new JButton("复 制 cron 表 达 式"); copyBtn.setForeground(Color.BLACK); BeautyEyeUtils.setButtonStyle(NormalColor.lightBlue, copyBtn); } @@ -99,8 +99,8 @@ protected void initComponents(Object... args) { @Override protected void setComponentsLayout(JPanel rootPanel) { rootPanel.add(toContralPanel(), BorderLayout.NORTH); -// rootPanel.add(toSchedulePanel(), BorderLayout.CENTER); -// rootPanel.add(createBtn, BorderLayout.SOUTH); + rootPanel.add(toExpressionPanel(), BorderLayout.CENTER); + rootPanel.add(copyBtn, BorderLayout.SOUTH); } private JPanel toContralPanel() { @@ -114,10 +114,8 @@ private JPanel toContralPanel() { tabbedPanel.add(new _WeekPanel(cron, "星期"), WEEK); tabbedPanel.add(new _YearPanel(cron, "年"), YEAR); } - SwingUtils.addBorder(tabbedPanel, "Contral"); + SwingUtils.addBorder(tabbedPanel, "Control"); panel.add(tabbedPanel, BorderLayout.CENTER); - - panel.add(toExpressionPanel(), BorderLayout.SOUTH); } return panel; } @@ -139,8 +137,8 @@ private JPanel toExpressionPanel() { panel.add(new JLabel(" "), BorderLayout.CENTER); - panel.add(SwingUtils.getWEBorderPanel( - new JLabel("Cron表达式 : "), tfExpression, copyBtn + panel.add(SwingUtils.getWBorderPanel( + tfExpression, new JLabel("Cron表达式 : ") ), BorderLayout.SOUTH); } SwingUtils.addBorder(panel, "Expression"); diff --git a/src/main/java/exp/cron/ui/_MinutePanel.java b/src/main/java/exp/cron/ui/_MinutePanel.java index ad57ff0..b5f7e44 100644 --- a/src/main/java/exp/cron/ui/_MinutePanel.java +++ b/src/main/java/exp/cron/ui/_MinutePanel.java @@ -18,7 +18,7 @@ public class _MinutePanel extends __TimePanel { private final static int MINUTE = 60; protected _MinutePanel(Cron cron, String name) { - super(cron, name, 4); + super(cron, name, 6); } @Override diff --git a/src/main/java/exp/cron/ui/_MonthPanel.java b/src/main/java/exp/cron/ui/_MonthPanel.java index 47c0a65..d341725 100644 --- a/src/main/java/exp/cron/ui/_MonthPanel.java +++ b/src/main/java/exp/cron/ui/_MonthPanel.java @@ -16,7 +16,7 @@ public class _MonthPanel extends __TimePanel { private static final long serialVersionUID = -7775377611552787648L; protected _MonthPanel(Cron cron, String name) { - super(cron, name, 2); + super(cron, name, 3); } @Override diff --git a/src/main/java/exp/cron/ui/_SecondPanel.java b/src/main/java/exp/cron/ui/_SecondPanel.java index c58639b..f373af7 100644 --- a/src/main/java/exp/cron/ui/_SecondPanel.java +++ b/src/main/java/exp/cron/ui/_SecondPanel.java @@ -18,7 +18,7 @@ public class _SecondPanel extends __TimePanel { private final static int SECOND = 60; protected _SecondPanel(Cron cron, String name) { - super(cron, name, 4); + super(cron, name, 6); } @Override diff --git a/src/main/java/exp/cron/ui/_WeekPanel.java b/src/main/java/exp/cron/ui/_WeekPanel.java index 81cadc7..299709e 100644 --- a/src/main/java/exp/cron/ui/_WeekPanel.java +++ b/src/main/java/exp/cron/ui/_WeekPanel.java @@ -95,7 +95,7 @@ protected CheckBoxGroup initSequence() { protected JPanel getEveryPanel() { return SwingUtils.getHFlowPanel(FlowLayout.LEFT, everyBtn, - new JLabel(" (注:星期1=周日、星期2=周一、星期3=周二、星期4=周三、星期5=周四、星期6=周五、星期7=周六)")); + new JLabel("(注:星期1=周日、星期2=周一、星期3=周二、星期4=周三、星期5=周四、星期6=周五、星期7=周六)")); } @Override diff --git a/src/main/java/exp/cron/ui/_YearPanel.java b/src/main/java/exp/cron/ui/_YearPanel.java index 46e19a5..723b5f5 100644 --- a/src/main/java/exp/cron/ui/_YearPanel.java +++ b/src/main/java/exp/cron/ui/_YearPanel.java @@ -16,10 +16,10 @@ public class _YearPanel extends __TimePanel { /** serialVersionUID */ private static final long serialVersionUID = 6055405583848024179L; - private final static int YEAR = 43; // 最多显示往后40年(理论cron最大的年份是2099年) + private final static int YEAR = 76; // 最多显示往后76年(理论cron最大的年份是2099年) protected _YearPanel(Cron cron, String name) { - super(cron, name, 4); + super(cron, name, 7); } @Override