diff --git a/doc/class-diagram.puml b/docs/diagrams/src/anyreport.puml similarity index 96% rename from doc/class-diagram.puml rename to docs/diagrams/src/anyreport.puml index 47ab336..001d23a 100644 --- a/doc/class-diagram.puml +++ b/docs/diagrams/src/anyreport.puml @@ -152,5 +152,4 @@ package moodle-anyreport{ TagModel --> TagControls TagModel --> UserListModel } - @enduml \ No newline at end of file diff --git a/doc/package.puml b/docs/diagrams/src/package.puml similarity index 100% rename from doc/package.puml rename to docs/diagrams/src/package.puml diff --git a/doc/use-case.puml b/docs/diagrams/src/use-case.puml similarity index 100% rename from doc/use-case.puml rename to docs/diagrams/src/use-case.puml diff --git a/pom.xml b/pom.xml index 83d98b7..2b8382d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - ru.egspt.moodle + ru.egspt moodle-anyreport 0.1 @@ -21,6 +21,11 @@ 5 + + mysql + mysql-connector-java + 8.0.28 + org.junit.jupiter junit-jupiter-api diff --git a/src/main/java/ru/egspt/moodle/Access.java b/src/main/java/ru/egspt/Access.java similarity index 86% rename from src/main/java/ru/egspt/moodle/Access.java rename to src/main/java/ru/egspt/Access.java index 0c1b75f..f08ecd1 100644 --- a/src/main/java/ru/egspt/moodle/Access.java +++ b/src/main/java/ru/egspt/Access.java @@ -1,4 +1,4 @@ -package main.java.ru.egspt.moodle; +package ru.egspt; public class Access { private String link; private String login; @@ -7,7 +7,7 @@ public class Access { * @param link the link to set */ public void setLink(String link) { - this.link = link; + this.link = "jdbc:MySQL://" + link + ":3306/moodle"; } /** * @return the link diff --git a/src/main/java/ru/egspt/moodle/AccessPane.java b/src/main/java/ru/egspt/AccessPane.java similarity index 94% rename from src/main/java/ru/egspt/moodle/AccessPane.java rename to src/main/java/ru/egspt/AccessPane.java index 1887e03..2970f7c 100644 --- a/src/main/java/ru/egspt/moodle/AccessPane.java +++ b/src/main/java/ru/egspt/AccessPane.java @@ -1,4 +1,4 @@ -package main.java.ru.egspt.moodle; +package ru.egspt; import javax.swing.JPanel; import java.awt.Color; import javax.swing.JButton; @@ -32,9 +32,10 @@ public class AccessPane extends JPanel { this.add(passField); this.add(linkLabel); this.add(linkField); - this.add(connButton); //настройка кнопки connButton + this.add(connButton); connButton.addActionListener(e -> BaseControls.ConnectToServer(base, this)); + //настройка кнопки отключения от базы this.add(DisconnButton); DisconnButton.addActionListener(e -> BaseControls.DisconnectFromServer(base)); TitledBorder border = new TitledBorder(new LineBorder(Color.black), "connection to mysql", TitledBorder.CENTER, TitledBorder.CENTER); diff --git a/src/main/java/ru/egspt/moodle/App.java b/src/main/java/ru/egspt/App.java similarity index 87% rename from src/main/java/ru/egspt/moodle/App.java rename to src/main/java/ru/egspt/App.java index 145021c..cebb408 100644 --- a/src/main/java/ru/egspt/moodle/App.java +++ b/src/main/java/ru/egspt/App.java @@ -1,4 +1,5 @@ -package main.java.ru.egspt.moodle; +package ru.egspt; + import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.WindowConstants; @@ -20,7 +21,6 @@ public class App extends JPanel{ mainframe.add(this); mainframe.setSize(640, 480); mainframe.setVisible(true); - //mainframe.setExtendedState(mainframe.MAXIMIZED_BOTH); } public static void main( String[] args ) { diff --git a/src/main/java/ru/egspt/moodle/Base.java b/src/main/java/ru/egspt/Base.java similarity index 95% rename from src/main/java/ru/egspt/moodle/Base.java rename to src/main/java/ru/egspt/Base.java index 8936ea7..da85056 100644 --- a/src/main/java/ru/egspt/moodle/Base.java +++ b/src/main/java/ru/egspt/Base.java @@ -1,4 +1,4 @@ -package main.java.ru.egspt.moodle; +package ru.egspt; import java.sql.Connection; import java.sql.DriverManager; @@ -7,7 +7,7 @@ public class Base { private Access access = new Access(); //request //response - Base(){ + public Base(){ getAccess().setLink("link"); getAccess().setLogin("login"); getAccess().setPassword("password"); diff --git a/src/main/java/ru/egspt/moodle/BaseControls.java b/src/main/java/ru/egspt/BaseControls.java similarity index 93% rename from src/main/java/ru/egspt/moodle/BaseControls.java rename to src/main/java/ru/egspt/BaseControls.java index 8c4d304..f72f40f 100644 --- a/src/main/java/ru/egspt/moodle/BaseControls.java +++ b/src/main/java/ru/egspt/BaseControls.java @@ -1,4 +1,4 @@ -package main.java.ru.egspt.moodle; +package ru.egspt; public class BaseControls { // diff --git a/src/main/java/ru/egspt/Data.java b/src/main/java/ru/egspt/Data.java new file mode 100644 index 0000000..5f80edf --- /dev/null +++ b/src/main/java/ru/egspt/Data.java @@ -0,0 +1,4 @@ +package ru.egspt; +public class Data { + +} diff --git a/src/main/java/ru/egspt/moodle/Data.java b/src/main/java/ru/egspt/moodle/Data.java deleted file mode 100644 index fada8c9..0000000 --- a/src/main/java/ru/egspt/moodle/Data.java +++ /dev/null @@ -1,4 +0,0 @@ -package main.java.ru.egspt.moodle; -public class Data { - -} diff --git a/src/test/java/ru/egspt/AppTest.java b/src/test/java/ru/egspt/AppTest.java deleted file mode 100644 index b6e3083..0000000 --- a/src/test/java/ru/egspt/AppTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package ru.egspt; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * Unit test for simple App. - */ -class AppTest { - /** - * Rigorous Test. - */ - @Test - void testApp() { - assertEquals(1, 1); - } -} diff --git a/target/checkstyle-cachefile b/target/checkstyle-cachefile new file mode 100644 index 0000000..8338d3a --- /dev/null +++ b/target/checkstyle-cachefile @@ -0,0 +1,3 @@ +#Wed May 11 16:06:06 MSK 2022 +module-resource*?\:checkstyle/suppressions.xml=3B4ADFBFB42AA213119FAA5299E87F0537A02AFD +configuration*?=9FACA937F0890BA0B556BC18568485F706CFAEA2 diff --git a/target/checkstyle-checker.xml b/target/checkstyle-checker.xml new file mode 100644 index 0000000..5f4800f --- /dev/null +++ b/target/checkstyle-checker.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/target/checkstyle-result.xml b/target/checkstyle-result.xml new file mode 100644 index 0000000..5951f20 --- /dev/null +++ b/target/checkstyle-result.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/target/classes/ru/egspt/Access.class b/target/classes/ru/egspt/Access.class new file mode 100644 index 0000000..a0b813b Binary files /dev/null and b/target/classes/ru/egspt/Access.class differ diff --git a/target/classes/ru/egspt/AccessPane.class b/target/classes/ru/egspt/AccessPane.class new file mode 100644 index 0000000..9ad1a97 Binary files /dev/null and b/target/classes/ru/egspt/AccessPane.class differ diff --git a/target/classes/ru/egspt/App.class b/target/classes/ru/egspt/App.class new file mode 100644 index 0000000..e5cb5d4 Binary files /dev/null and b/target/classes/ru/egspt/App.class differ diff --git a/target/classes/ru/egspt/Base.class b/target/classes/ru/egspt/Base.class new file mode 100644 index 0000000..5bc01a9 Binary files /dev/null and b/target/classes/ru/egspt/Base.class differ diff --git a/target/classes/ru/egspt/BaseControls.class b/target/classes/ru/egspt/BaseControls.class new file mode 100644 index 0000000..22129a4 Binary files /dev/null and b/target/classes/ru/egspt/BaseControls.class differ diff --git a/target/classes/ru/egspt/Data.class b/target/classes/ru/egspt/Data.class new file mode 100644 index 0000000..8d380f5 Binary files /dev/null and b/target/classes/ru/egspt/Data.class differ