diff --git a/report.xlsx b/report.xlsx new file mode 100644 index 0000000..dbd3136 Binary files /dev/null and b/report.xlsx differ diff --git a/src/main/java/ru/egspt/moodle/Access.java b/src/main/java/ru/egspt/moodle/Access.java index 8b4e532..25053ac 100644 --- a/src/main/java/ru/egspt/moodle/Access.java +++ b/src/main/java/ru/egspt/moodle/Access.java @@ -9,15 +9,15 @@ public class Access { //если значение userName отсутствует, запросить его у пользователя public static String getUserName(){ - setUserName(); + //setUserName(); return userName; } public static String getPassword(){ - setPassword(); + //setPassword(); return password; } public static String getURL(){ - setUrl(); + //setUrl(); return url; } /** diff --git a/src/main/java/ru/egspt/moodle/App.java b/src/main/java/ru/egspt/moodle/App.java index cfc4c82..23de895 100644 --- a/src/main/java/ru/egspt/moodle/App.java +++ b/src/main/java/ru/egspt/moodle/App.java @@ -4,6 +4,9 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.WindowConstants; +import ru.egspt.moodle.panel.Account; +import ru.egspt.moodle.panel.UserByTag; + /** * графический интерфейс для * moodle.anyreport @@ -11,9 +14,13 @@ import javax.swing.WindowConstants; */ public class App extends JPanel { JFrame mainframe = new JFrame("moodle-anyreport"); + Account account = new Account(); + //Users pUsers = new Users(); + //Заполняем панельку компонентами App(){ + this.add(account); } //устанавливаем панельку на форму public void init(){ @@ -29,5 +36,7 @@ public class App extends JPanel { System.out.println( "Работает подготовщик отчетов по результатам тестирования пользователей ..." ); App anyreport = new App(); anyreport.init(); + //System.out.println( "Работа с приложением завершена." ); + } } diff --git a/src/main/java/ru/egspt/moodle/events/ConnactionListener.java b/src/main/java/ru/egspt/moodle/events/ConnactionListener.java new file mode 100644 index 0000000..eba6ea1 --- /dev/null +++ b/src/main/java/ru/egspt/moodle/events/ConnactionListener.java @@ -0,0 +1,24 @@ +package ru.egspt.moodle.events; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import ru.egspt.moodle.Access; +import ru.egspt.moodle.panel.Account; + +public class ConnactionListener implements ActionListener{ + Account account; + public ConnactionListener(Account account){ + this.account = account; + } + public void actionPerformed(ActionEvent e) { + System.out.println("Нажата кнопка Connect"); + Access.setUserName(account.getLoginField().getText()); + Access.setPassword(String.valueOf(account.getPassField().getPassword())); + Access.setUrl(account.getUrlField().getText()); + System.out.println(Access.getUserName()); + System.out.println(Access.getPassword()); + System.out.println(Access.getURL()); + account.getMainframe().dispose(); + } +} diff --git a/src/main/java/ru/egspt/moodle/panel/Account.java b/src/main/java/ru/egspt/moodle/panel/Account.java index ece73b5..526aa21 100644 --- a/src/main/java/ru/egspt/moodle/panel/Account.java +++ b/src/main/java/ru/egspt/moodle/panel/Account.java @@ -1,10 +1,6 @@ package ru.egspt.moodle.panel; import java.awt.Color; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -15,9 +11,11 @@ import javax.swing.WindowConstants; import javax.swing.border.LineBorder; import javax.swing.border.TitledBorder; -import ru.egspt.moodle.Access; +import ru.egspt.moodle.events.ConnactionListener; public class Account extends JPanel{ + + private JFrame mainframe = new JFrame("connaction"); private JLabel loginLabel = new JLabel("Имя пользователя: "); private JTextField loginField = new JTextField(25); private JLabel passLabel = new JLabel("Пароль: "); @@ -36,7 +34,6 @@ public class Account extends JPanel{ this.add(passField); this.add(urlLabel); this.add(urlField); - this.add(connButton); this.add(connCloseButton); TitledBorder border = new TitledBorder(new LineBorder(Color.black), "connection to mysql", TitledBorder.CENTER, TitledBorder.CENTER); @@ -46,26 +43,37 @@ public class Account extends JPanel{ this.setVisible(true); } public void init(){ - JFrame mainframe = new JFrame("connaction"); mainframe.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); mainframe.add(this); mainframe.setSize(320, 240); mainframe.setVisible(true); //настройка кнопки connButton - connButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - System.out.println("Нажата кнопка Connect"); - Access.setUserName(loginField.getText()); - Access.setPassword(String.valueOf(passField.getPassword())); - Access.setUrl(urlField.getText()); - //tmpFrame.dispose(); - System.out.println(Access.getUserName()); - System.out.println(Access.getPassword()); - System.out.println(Access.getURL()); - mainframe.dispose(); - } - }); + connButton.addActionListener(new ConnactionListener(this)); + } + /** + * @return the loginField + */ + public JTextField getLoginField() { + return loginField; + } + /** + * @return the passField + */ + public JPasswordField getPassField() { + return passField; + } + /** + * @return the urlField + */ + public JTextField getUrlField() { + return urlField; + } + /** + * @return the mainframe + */ + public JFrame getMainframe() { + return mainframe; } public static void main( String[] args ) { diff --git a/src/main/java/ru/egspt/moodle/panel/ReportSample.java b/src/main/java/ru/egspt/moodle/panel/ReportSample.java index e69de29..c77338b 100644 --- a/src/main/java/ru/egspt/moodle/panel/ReportSample.java +++ b/src/main/java/ru/egspt/moodle/panel/ReportSample.java @@ -0,0 +1,34 @@ +package ru.egspt.moodle.panel; + +import java.awt.Color; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import javax.swing.WindowConstants; +import javax.swing.border.LineBorder; +import javax.swing.border.TitledBorder; + +public class ReportSample extends JPanel{ + private JFrame mainframe = new JFrame("report-sample"); + private JTextArea ReportArea = new JTextArea(); + + + public ReportSample(){ + TitledBorder border = new TitledBorder(new LineBorder(Color.black), "Report-Sample", TitledBorder.CENTER, TitledBorder.CENTER); + this.setBorder(border); + this.add(ReportArea); + + } + public void init(){ + mainframe.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + mainframe.add(this); + mainframe.setSize(320, 240); + mainframe.setVisible(true); + } + public static void main( String[] args ) + { + System.out.println( "Проверка работоспособности класса ReportSample ..." ); + ReportSample rs = new ReportSample(); + rs.init(); + } +} \ No newline at end of file diff --git a/src/main/java/ru/egspt/moodle/panel/Users.java b/src/main/java/ru/egspt/moodle/panel/UserByTag.java similarity index 56% rename from src/main/java/ru/egspt/moodle/panel/Users.java rename to src/main/java/ru/egspt/moodle/panel/UserByTag.java index 6fe2e1a..01da2df 100644 --- a/src/main/java/ru/egspt/moodle/panel/Users.java +++ b/src/main/java/ru/egspt/moodle/panel/UserByTag.java @@ -1,5 +1,5 @@ package ru.egspt.moodle.panel; -public class Users { +public class UserByTag { } diff --git a/target/classes/ru/egspt/moodle/Access.class b/target/classes/ru/egspt/moodle/Access.class index 7f13fb8..49e2988 100644 Binary files a/target/classes/ru/egspt/moodle/Access.class and b/target/classes/ru/egspt/moodle/Access.class differ diff --git a/target/classes/ru/egspt/moodle/App.class b/target/classes/ru/egspt/moodle/App.class index 7cac12a..158246b 100644 Binary files a/target/classes/ru/egspt/moodle/App.class and b/target/classes/ru/egspt/moodle/App.class differ diff --git a/target/classes/ru/egspt/moodle/events/ConnactionListener.class b/target/classes/ru/egspt/moodle/events/ConnactionListener.class new file mode 100644 index 0000000..c897233 Binary files /dev/null and b/target/classes/ru/egspt/moodle/events/ConnactionListener.class differ diff --git a/target/classes/ru/egspt/moodle/panel/Account$1.class b/target/classes/ru/egspt/moodle/panel/Account$1.class deleted file mode 100644 index f2dbe70..0000000 Binary files a/target/classes/ru/egspt/moodle/panel/Account$1.class and /dev/null differ diff --git a/target/classes/ru/egspt/moodle/panel/Account.class b/target/classes/ru/egspt/moodle/panel/Account.class index cb67803..6db73fd 100644 Binary files a/target/classes/ru/egspt/moodle/panel/Account.class and b/target/classes/ru/egspt/moodle/panel/Account.class differ diff --git a/target/classes/ru/egspt/moodle/panel/ReportSample.class b/target/classes/ru/egspt/moodle/panel/ReportSample.class new file mode 100644 index 0000000..42489db Binary files /dev/null and b/target/classes/ru/egspt/moodle/panel/ReportSample.class differ diff --git a/target/classes/ru/egspt/moodle/panel/UserByTag.class b/target/classes/ru/egspt/moodle/panel/UserByTag.class new file mode 100644 index 0000000..b5ead9c Binary files /dev/null and b/target/classes/ru/egspt/moodle/panel/UserByTag.class differ diff --git a/target/classes/ru/egspt/moodle/panel/Users.class b/target/classes/ru/egspt/moodle/panel/Users.class deleted file mode 100644 index 44b6432..0000000 Binary files a/target/classes/ru/egspt/moodle/panel/Users.class and /dev/null differ