diff --git a/src/main/java/ru/egspt/moodle/Access.java b/src/main/java/ru/egspt/moodle/Access.java index 9187400..8b4e532 100644 --- a/src/main/java/ru/egspt/moodle/Access.java +++ b/src/main/java/ru/egspt/moodle/Access.java @@ -26,12 +26,18 @@ public class Access { public static void setUserName() { Access.userName = JOptionPane.showInputDialog("Укажите имя пользователя базы данных:"); } + public static void setUserName(String username){ + Access.userName = username; + } /** * @param password the password to set */ public static void setPassword() { Access.password = JOptionPane.showInputDialog("Укажите пароль пользователя базы данных:"); } + public static void setPassword(String password){ + Access.password = password; + } /** * @param url the url to set */ @@ -39,6 +45,9 @@ public class Access { String u = JOptionPane.showInputDialog("Укажите url базы данных:"); Access.url = "jdbc:MySQL://" + u + ":3306/moodle"; } + public static void setUrl(String url) { + Access.url = "jdbc:MySQL://" + url + ":3306/moodle"; + } } diff --git a/src/main/java/ru/egspt/moodle/App.java b/src/main/java/ru/egspt/moodle/App.java index 89c2bf3..cfc4c82 100644 --- a/src/main/java/ru/egspt/moodle/App.java +++ b/src/main/java/ru/egspt/moodle/App.java @@ -10,12 +10,10 @@ import javax.swing.WindowConstants; * */ public class App extends JPanel { - JFrame mainframe = new JFrame("mainframe"); + JFrame mainframe = new JFrame("moodle-anyreport"); //Заполняем панельку компонентами App(){ - - } //устанавливаем панельку на форму public void init(){ diff --git a/src/main/java/ru/egspt/moodle/Base.java b/src/main/java/ru/egspt/moodle/Base.java index 3d303b9..5993d46 100644 --- a/src/main/java/ru/egspt/moodle/Base.java +++ b/src/main/java/ru/egspt/moodle/Base.java @@ -28,6 +28,9 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; + +import ru.egspt.moodle.panel.Account; + import java.util.ArrayList; import javax.swing.JOptionPane; @@ -445,6 +448,7 @@ public class Base { System.out.println("Подключение к серверу баз данных ..."); Connection conn = null; try{ + //new Account().init(); //данные аккаунта String userName = Access.getUserName(); String password = Access.getPassword(); diff --git a/src/main/java/ru/egspt/moodle/panel/Account.java b/src/main/java/ru/egspt/moodle/panel/Account.java new file mode 100644 index 0000000..ece73b5 --- /dev/null +++ b/src/main/java/ru/egspt/moodle/panel/Account.java @@ -0,0 +1,78 @@ +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; +import javax.swing.JPanel; +import javax.swing.JPasswordField; +import javax.swing.JTextField; +import javax.swing.WindowConstants; +import javax.swing.border.LineBorder; +import javax.swing.border.TitledBorder; + +import ru.egspt.moodle.Access; + +public class Account extends JPanel{ + private JLabel loginLabel = new JLabel("Имя пользователя: "); + private JTextField loginField = new JTextField(25); + private JLabel passLabel = new JLabel("Пароль: "); + private JPasswordField passField = new JPasswordField(25); + private JLabel urlLabel = new JLabel("Адрес сервера: "); + private JTextField urlField = new JTextField(25); + private JButton connButton = new JButton("Подключиться"); + private JButton connCloseButton = new JButton("Отключиться"); + + public Account(){ + loginField.setText("esoe");//значения по умолчанию + urlField.setText("www.egspt.ru");//значения по умолчанию + this.add(loginLabel); + this.add(loginField); + this.add(passLabel); + 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); + this.setBorder(border); + //this.setBorder(BorderFactory.createTitledBorder("аккаунт сервера базы данных")); + this.setSize(320, 240); + 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(); + } + }); + } + public static void main( String[] args ) + { + System.out.println( "Проверка работоспособности класса Account ..." ); + Account acc = new Account(); + acc.init(); + } + + +} diff --git a/src/main/java/ru/egspt/moodle/panel/Controls.java b/src/main/java/ru/egspt/moodle/panel/Controls.java new file mode 100644 index 0000000..a3b7d40 --- /dev/null +++ b/src/main/java/ru/egspt/moodle/panel/Controls.java @@ -0,0 +1,5 @@ +package ru.egspt.moodle.panel; + +public class Controls { + +} diff --git a/src/main/java/ru/egspt/moodle/panel/CurrentList.java b/src/main/java/ru/egspt/moodle/panel/CurrentList.java new file mode 100644 index 0000000..7cf1bcf --- /dev/null +++ b/src/main/java/ru/egspt/moodle/panel/CurrentList.java @@ -0,0 +1,5 @@ +package ru.egspt.moodle.panel; + +public class CurrentList { + +} diff --git a/src/main/java/ru/egspt/moodle/panel/CurrentTag.java b/src/main/java/ru/egspt/moodle/panel/CurrentTag.java new file mode 100644 index 0000000..0db07af --- /dev/null +++ b/src/main/java/ru/egspt/moodle/panel/CurrentTag.java @@ -0,0 +1,5 @@ +package ru.egspt.moodle.panel; + +public class CurrentTag { + +} diff --git a/src/main/java/ru/egspt/moodle/panel/ReportSample.java b/src/main/java/ru/egspt/moodle/panel/ReportSample.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/ru/egspt/moodle/panel/ReportUser.java b/src/main/java/ru/egspt/moodle/panel/ReportUser.java new file mode 100644 index 0000000..d2a00a8 --- /dev/null +++ b/src/main/java/ru/egspt/moodle/panel/ReportUser.java @@ -0,0 +1,5 @@ +package ru.egspt.moodle.panel; + +public class ReportUser { + +} diff --git a/src/main/java/ru/egspt/moodle/panel/Users.java b/src/main/java/ru/egspt/moodle/panel/Users.java new file mode 100644 index 0000000..6fe2e1a --- /dev/null +++ b/src/main/java/ru/egspt/moodle/panel/Users.java @@ -0,0 +1,5 @@ +package ru.egspt.moodle.panel; + +public class Users { + +} diff --git a/target/classes/ru/egspt/moodle/Access.class b/target/classes/ru/egspt/moodle/Access.class index cbd3ed0..7f13fb8 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 ad6a0a0..7cac12a 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/Base.class b/target/classes/ru/egspt/moodle/Base.class index 6083702..b0856d5 100644 Binary files a/target/classes/ru/egspt/moodle/Base.class and b/target/classes/ru/egspt/moodle/Base.class differ diff --git a/target/classes/ru/egspt/moodle/panel/Account$1.class b/target/classes/ru/egspt/moodle/panel/Account$1.class new file mode 100644 index 0000000..f2dbe70 Binary files /dev/null and b/target/classes/ru/egspt/moodle/panel/Account$1.class differ diff --git a/target/classes/ru/egspt/moodle/panel/Account.class b/target/classes/ru/egspt/moodle/panel/Account.class new file mode 100644 index 0000000..cb67803 Binary files /dev/null and b/target/classes/ru/egspt/moodle/panel/Account.class differ diff --git a/target/classes/ru/egspt/moodle/panel/Controls.class b/target/classes/ru/egspt/moodle/panel/Controls.class new file mode 100644 index 0000000..9602cc9 Binary files /dev/null and b/target/classes/ru/egspt/moodle/panel/Controls.class differ diff --git a/target/classes/ru/egspt/moodle/panel/CurrentList.class b/target/classes/ru/egspt/moodle/panel/CurrentList.class new file mode 100644 index 0000000..d33c4c6 Binary files /dev/null and b/target/classes/ru/egspt/moodle/panel/CurrentList.class differ diff --git a/target/classes/ru/egspt/moodle/panel/CurrentTag.class b/target/classes/ru/egspt/moodle/panel/CurrentTag.class new file mode 100644 index 0000000..8b69218 Binary files /dev/null and b/target/classes/ru/egspt/moodle/panel/CurrentTag.class differ diff --git a/target/classes/ru/egspt/moodle/panel/ReportUser.class b/target/classes/ru/egspt/moodle/panel/ReportUser.class new file mode 100644 index 0000000..d079bcc Binary files /dev/null and b/target/classes/ru/egspt/moodle/panel/ReportUser.class differ diff --git a/target/classes/ru/egspt/moodle/panel/Users.class b/target/classes/ru/egspt/moodle/panel/Users.class new file mode 100644 index 0000000..44b6432 Binary files /dev/null and b/target/classes/ru/egspt/moodle/panel/Users.class differ