diff --git a/Lab5Client/.gitignore b/Lab5Client/.gitignore
new file mode 100644
index 0000000..8a0a60d
--- /dev/null
+++ b/Lab5Client/.gitignore
@@ -0,0 +1,4 @@
+# Project exclude paths
+/.gradle/
+/build/
+/build/classes/java/main/
\ No newline at end of file
diff --git a/Lab5Client/build/classes/java/main/client/Lab5Client.class b/Lab5Client/build/classes/java/main/client/Lab5Client.class
deleted file mode 100644
index e3dd504..0000000
Binary files a/Lab5Client/build/classes/java/main/client/Lab5Client.class and /dev/null differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class
deleted file mode 100644
index 9963777..0000000
Binary files a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class and /dev/null differ
diff --git a/Lab5Client/build/classes/java/main/client/net/UDPClient.class b/Lab5Client/build/classes/java/main/client/net/UDPClient.class
deleted file mode 100644
index 838886a..0000000
Binary files a/Lab5Client/build/classes/java/main/client/net/UDPClient.class and /dev/null differ
diff --git a/Lab5Client/build/docs/javadoc/allclasses-frame.html b/Lab5Client/build/docs/javadoc/allclasses-frame.html
deleted file mode 100644
index b825b12..0000000
--- a/Lab5Client/build/docs/javadoc/allclasses-frame.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-All Classes (Lab5Client 3.0 API)
-
-
-
-
-All Classes
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/allclasses-noframe.html b/Lab5Client/build/docs/javadoc/allclasses-noframe.html
deleted file mode 100644
index 03cda0a..0000000
--- a/Lab5Client/build/docs/javadoc/allclasses-noframe.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-All Classes (Lab5Client 3.0 API)
-
-
-
-
-All Classes
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/Lab5Client.html b/Lab5Client/build/docs/javadoc/client/Lab5Client.html
deleted file mode 100644
index 549c38a..0000000
--- a/Lab5Client/build/docs/javadoc/client/Lab5Client.html
+++ /dev/null
@@ -1,317 +0,0 @@
-
-
-
-
-
-Lab5Client (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-Fields
-
-Modifier and Type
-Field and Description
-
-
-static java.util.logging.Logger
-LOGGER
-
-
-static UDPClient
-UDP
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-Lab5Client ()
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-Lab5Client
-public Lab5Client()
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html
deleted file mode 100644
index 116e666..0000000
--- a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html
+++ /dev/null
@@ -1,310 +0,0 @@
-
-
-
-
-
-CommandLineHandlerClient (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.commandline.CommandLineHandler
-
-
-client.commandline.CommandLineHandlerClient
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Nested Class Summary
-
-
-
-
-Nested classes/interfaces inherited from class common.commandline.CommandLineHandler
-common.commandline.CommandLineHandler.CommandLineNotInitialized, common.commandline.CommandLineHandler.ExecuteScriptCommand, common.commandline.CommandLineHandler.ExitCommand, common.commandline.CommandLineHandler.HistoryCommand
-
-
-
-
-
-
-
-
-Field Summary
-
-
-
-
-Fields inherited from class common.commandline.CommandLineHandler
-fileNames, history, inputs, instance, isActive, reader
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class common.commandline.CommandLineHandler
-addNewInput, awaitInput, awaitInput, awaitInput, awaitInput, awaitPassword, clearScreen, getInstance, getUser, input, isActive, removeInput, setUser, start, updateHistory
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html b/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html
deleted file mode 100644
index 868717c..0000000
--- a/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-client.commandline (Lab5Client 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html b/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html
deleted file mode 100644
index 9f380a5..0000000
--- a/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-client.commandline (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html b/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html
deleted file mode 100644
index 5fa01fd..0000000
--- a/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-client.commandline Class Hierarchy (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
Class Hierarchy
-
-java.lang.Object
-
-common.commandline.CommandLineHandler
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/net/UDPClient.html b/Lab5Client/build/docs/javadoc/client/net/UDPClient.html
deleted file mode 100644
index b57f9de..0000000
--- a/Lab5Client/build/docs/javadoc/client/net/UDPClient.html
+++ /dev/null
@@ -1,349 +0,0 @@
-
-
-
-
-
-UDPClient (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-UDPClient (int port)
-
-
-UDPClient (java.lang.String hostname,
- int port)
-
-
-
-
-
-
-
-
-
-Method Summary
-
-All Methods Instance Methods Concrete Methods
-
-Modifier and Type
-Method and Description
-
-
-void
-connect ()
-
-
-void
-disconnect ()
-
-
-common.commandline.response.CommandResult
-receive ()
-
-
-common.commandline.response.CommandResult
-send (common.commandline.Command command,
- java.lang.Object[] args)
-
-
-void
-setHostname (java.lang.String hostname)
-
-
-void
-setPort (int port)
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-connect
-public void connect()
-
-
-
-
-
-
-
-disconnect
-public void disconnect()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/net/package-frame.html b/Lab5Client/build/docs/javadoc/client/net/package-frame.html
deleted file mode 100644
index ba9a307..0000000
--- a/Lab5Client/build/docs/javadoc/client/net/package-frame.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-client.net (Lab5Client 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/net/package-summary.html b/Lab5Client/build/docs/javadoc/client/net/package-summary.html
deleted file mode 100644
index db44415..0000000
--- a/Lab5Client/build/docs/javadoc/client/net/package-summary.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-client.net (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-Class Summary
-
-Class
-Description
-
-
-
-UDPClient
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/net/package-tree.html b/Lab5Client/build/docs/javadoc/client/net/package-tree.html
deleted file mode 100644
index 64a04f0..0000000
--- a/Lab5Client/build/docs/javadoc/client/net/package-tree.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-client.net Class Hierarchy (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/package-frame.html b/Lab5Client/build/docs/javadoc/client/package-frame.html
deleted file mode 100644
index 00f0845..0000000
--- a/Lab5Client/build/docs/javadoc/client/package-frame.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-client (Lab5Client 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/package-summary.html b/Lab5Client/build/docs/javadoc/client/package-summary.html
deleted file mode 100644
index 45757c8..0000000
--- a/Lab5Client/build/docs/javadoc/client/package-summary.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-client (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-Class Summary
-
-Class
-Description
-
-
-
-Lab5Client
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/client/package-tree.html b/Lab5Client/build/docs/javadoc/client/package-tree.html
deleted file mode 100644
index b5bbe67..0000000
--- a/Lab5Client/build/docs/javadoc/client/package-tree.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-client Class Hierarchy (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/constant-values.html b/Lab5Client/build/docs/javadoc/constant-values.html
deleted file mode 100644
index 730af22..0000000
--- a/Lab5Client/build/docs/javadoc/constant-values.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-Constant Field Values (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/deprecated-list.html b/Lab5Client/build/docs/javadoc/deprecated-list.html
deleted file mode 100644
index fe627bf..0000000
--- a/Lab5Client/build/docs/javadoc/deprecated-list.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-Deprecated List (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/help-doc.html b/Lab5Client/build/docs/javadoc/help-doc.html
deleted file mode 100644
index 4e5a403..0000000
--- a/Lab5Client/build/docs/javadoc/help-doc.html
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
-
-API Help (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-Overview
-The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.
-
-
-Package
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:
-
-Interfaces (italic)
-Classes
-Enums
-Exceptions
-Errors
-Annotation Types
-
-
-
-Class/Interface
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:
-
-Class inheritance diagram
-Direct Subclasses
-All Known Subinterfaces
-All Known Implementing Classes
-Class/interface declaration
-Class/interface description
-
-
-Nested Class Summary
-Field Summary
-Constructor Summary
-Method Summary
-
-
-Field Detail
-Constructor Detail
-Method Detail
-
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.
-
-
-Annotation Type
-Each annotation type has its own separate page with the following sections:
-
-Annotation Type declaration
-Annotation Type description
-Required Element Summary
-Optional Element Summary
-Element Detail
-
-
-
-Enum
-Each enum has its own separate page with the following sections:
-
-Enum declaration
-Enum description
-Enum Constant Summary
-Enum Constant Detail
-
-
-
-Tree (Class Hierarchy)
-There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object
. The interfaces do not inherit from java.lang.Object
.
-
-When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
-When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
-
-
-
-Deprecated API
-The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
-
-
-Index
-The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
-
-
-Prev/Next
-These links take you to the next or previous class, interface, package, or related page.
-
-
-Frames/No Frames
-These links show and hide the HTML frames. All pages are available with or without frames.
-
-
-All Classes
-The All Classes link shows all classes and interfaces except non-static nested types.
-
-
-Serialized Form
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-
-
-Constant Field Values
-The Constant Field Values page lists the static final fields and their values.
-
-
-
This help file applies to API documentation generated using the standard doclet.
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/index-all.html b/Lab5Client/build/docs/javadoc/index-all.html
deleted file mode 100644
index 04718cc..0000000
--- a/Lab5Client/build/docs/javadoc/index-all.html
+++ /dev/null
@@ -1,214 +0,0 @@
-
-
-
-
-
-Index (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-C D E G L M R S U
-
-
-
C
-
-client - package client
-
-client.commandline - package client.commandline
-
-client.net - package client.net
-
-CommandLineHandlerClient - Class in client.commandline
-
-connect() - Method in class client.net.UDPClient
-
-
-
-
-
-
D
-
-disconnect() - Method in class client.net.UDPClient
-
-
-
-
-
-
E
-
-executeCommand(String, String[]) - Method in class client.commandline.CommandLineHandlerClient
-
-executeOnServer(Command, Object[]) - Static method in class client.commandline.CommandLineHandlerClient
-
-
-
-
-
-
G
-
-getClientCommandLine() - Static method in class client.commandline.CommandLineHandlerClient
-
-
-
-
-
-
L
-
-Lab5Client - Class in client
-
-Lab5Client() - Constructor for class client.Lab5Client
-
-LOGGER - Static variable in class client.Lab5Client
-
-
-
-
-
-
M
-
-main(String[]) - Static method in class client.Lab5Client
-
-
-
-
-
-
R
-
-receive() - Method in class client.net.UDPClient
-
-
-
-
-
-
S
-
-send(Command, Object[]) - Method in class client.net.UDPClient
-
-setHostname(String) - Method in class client.net.UDPClient
-
-setPort(int) - Method in class client.net.UDPClient
-
-
-
-
-
-
U
-
-UDP - Static variable in class client.Lab5Client
-
-UDPClient - Class in client.net
-
-UDPClient(int) - Constructor for class client.net.UDPClient
-
-UDPClient(String, int) - Constructor for class client.net.UDPClient
-
-
-
C D E G L M R S U
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/index.html b/Lab5Client/build/docs/javadoc/index.html
deleted file mode 100644
index 641a74d..0000000
--- a/Lab5Client/build/docs/javadoc/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-Lab5Client 3.0 API
-
-
-
-
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-Frame Alert
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to Non-frame version .
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/overview-frame.html b/Lab5Client/build/docs/javadoc/overview-frame.html
deleted file mode 100644
index 676fb75..0000000
--- a/Lab5Client/build/docs/javadoc/overview-frame.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-Overview List (Lab5Client 3.0 API)
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/overview-summary.html b/Lab5Client/build/docs/javadoc/overview-summary.html
deleted file mode 100644
index 651d975..0000000
--- a/Lab5Client/build/docs/javadoc/overview-summary.html
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
-
-
-Overview (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/overview-tree.html b/Lab5Client/build/docs/javadoc/overview-tree.html
deleted file mode 100644
index 40efa57..0000000
--- a/Lab5Client/build/docs/javadoc/overview-tree.html
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
-
-Class Hierarchy (Lab5Client 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Client/build/docs/javadoc/package-list b/Lab5Client/build/docs/javadoc/package-list
deleted file mode 100644
index 86b778a..0000000
--- a/Lab5Client/build/docs/javadoc/package-list
+++ /dev/null
@@ -1,3 +0,0 @@
-client
-client.commandline
-client.net
diff --git a/Lab5Client/build/docs/javadoc/script.js b/Lab5Client/build/docs/javadoc/script.js
deleted file mode 100644
index b346356..0000000
--- a/Lab5Client/build/docs/javadoc/script.js
+++ /dev/null
@@ -1,30 +0,0 @@
-function show(type)
-{
- count = 0;
- for (var key in methods) {
- var row = document.getElementById(key);
- if ((methods[key] & type) != 0) {
- row.style.display = '';
- row.className = (count++ % 2) ? rowColor : altColor;
- }
- else
- row.style.display = 'none';
- }
- updateTabs(type);
-}
-
-function updateTabs(type)
-{
- for (var value in tabs) {
- var sNode = document.getElementById(tabs[value][0]);
- var spanNode = sNode.firstChild;
- if (value == type) {
- sNode.className = activeTableTab;
- spanNode.innerHTML = tabs[value][1];
- }
- else {
- sNode.className = tableTab;
- spanNode.innerHTML = "" + tabs[value][1] + " ";
- }
- }
-}
diff --git a/Lab5Client/build/docs/javadoc/stylesheet.css b/Lab5Client/build/docs/javadoc/stylesheet.css
deleted file mode 100644
index 98055b2..0000000
--- a/Lab5Client/build/docs/javadoc/stylesheet.css
+++ /dev/null
@@ -1,574 +0,0 @@
-/* Javadoc style sheet */
-/*
-Overall document style
-*/
-
-@import url('resources/fonts/dejavu.css');
-
-body {
- background-color:#ffffff;
- color:#353833;
- font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
- font-size:14px;
- margin:0;
-}
-a:link, a:visited {
- text-decoration:none;
- color:#4A6782;
-}
-a:hover, a:focus {
- text-decoration:none;
- color:#bb7a2a;
-}
-a:active {
- text-decoration:none;
- color:#4A6782;
-}
-a[name] {
- color:#353833;
-}
-a[name]:hover {
- text-decoration:none;
- color:#353833;
-}
-pre {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
-}
-h1 {
- font-size:20px;
-}
-h2 {
- font-size:18px;
-}
-h3 {
- font-size:16px;
- font-style:italic;
-}
-h4 {
- font-size:13px;
-}
-h5 {
- font-size:12px;
-}
-h6 {
- font-size:11px;
-}
-ul {
- list-style-type:disc;
-}
-code, tt {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- padding-top:4px;
- margin-top:8px;
- line-height:1.4em;
-}
-dt code {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- padding-top:4px;
-}
-table tr td dt code {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- vertical-align:top;
- padding-top:4px;
-}
-sup {
- font-size:8px;
-}
-/*
-Document title and Copyright styles
-*/
-.clear {
- clear:both;
- height:0px;
- overflow:hidden;
-}
-.aboutLanguage {
- float:right;
- padding:0px 21px;
- font-size:11px;
- z-index:200;
- margin-top:-9px;
-}
-.legalCopy {
- margin-left:.5em;
-}
-.bar a, .bar a:link, .bar a:visited, .bar a:active {
- color:#FFFFFF;
- text-decoration:none;
-}
-.bar a:hover, .bar a:focus {
- color:#bb7a2a;
-}
-.tab {
- background-color:#0066FF;
- color:#ffffff;
- padding:8px;
- width:5em;
- font-weight:bold;
-}
-/*
-Navigation bar styles
-*/
-.bar {
- background-color:#4D7A97;
- color:#FFFFFF;
- padding:.8em .5em .4em .8em;
- height:auto;/*height:1.8em;*/
- font-size:11px;
- margin:0;
-}
-.topNav {
- background-color:#4D7A97;
- color:#FFFFFF;
- float:left;
- padding:0;
- width:100%;
- clear:right;
- height:2.8em;
- padding-top:10px;
- overflow:hidden;
- font-size:12px;
-}
-.bottomNav {
- margin-top:10px;
- background-color:#4D7A97;
- color:#FFFFFF;
- float:left;
- padding:0;
- width:100%;
- clear:right;
- height:2.8em;
- padding-top:10px;
- overflow:hidden;
- font-size:12px;
-}
-.subNav {
- background-color:#dee3e9;
- float:left;
- width:100%;
- overflow:hidden;
- font-size:12px;
-}
-.subNav div {
- clear:left;
- float:left;
- padding:0 0 5px 6px;
- text-transform:uppercase;
-}
-ul.navList, ul.subNavList {
- float:left;
- margin:0 25px 0 0;
- padding:0;
-}
-ul.navList li{
- list-style:none;
- float:left;
- padding: 5px 6px;
- text-transform:uppercase;
-}
-ul.subNavList li{
- list-style:none;
- float:left;
-}
-.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
- color:#FFFFFF;
- text-decoration:none;
- text-transform:uppercase;
-}
-.topNav a:hover, .bottomNav a:hover {
- text-decoration:none;
- color:#bb7a2a;
- text-transform:uppercase;
-}
-.navBarCell1Rev {
- background-color:#F8981D;
- color:#253441;
- margin: auto 5px;
-}
-.skipNav {
- position:absolute;
- top:auto;
- left:-9999px;
- overflow:hidden;
-}
-/*
-Page header and footer styles
-*/
-.header, .footer {
- clear:both;
- margin:0 20px;
- padding:5px 0 0 0;
-}
-.indexHeader {
- margin:10px;
- position:relative;
-}
-.indexHeader span{
- margin-right:15px;
-}
-.indexHeader h1 {
- font-size:13px;
-}
-.title {
- color:#2c4557;
- margin:10px 0;
-}
-.subTitle {
- margin:5px 0 0 0;
-}
-.header ul {
- margin:0 0 15px 0;
- padding:0;
-}
-.footer ul {
- margin:20px 0 5px 0;
-}
-.header ul li, .footer ul li {
- list-style:none;
- font-size:13px;
-}
-/*
-Heading styles
-*/
-div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
- background-color:#dee3e9;
- border:1px solid #d0d9e0;
- margin:0 0 6px -8px;
- padding:7px 5px;
-}
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
- background-color:#dee3e9;
- border:1px solid #d0d9e0;
- margin:0 0 6px -8px;
- padding:7px 5px;
-}
-ul.blockList ul.blockList li.blockList h3 {
- padding:0;
- margin:15px 0;
-}
-ul.blockList li.blockList h2 {
- padding:0px 0 20px 0;
-}
-/*
-Page layout container styles
-*/
-.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
- clear:both;
- padding:10px 20px;
- position:relative;
-}
-.indexContainer {
- margin:10px;
- position:relative;
- font-size:12px;
-}
-.indexContainer h2 {
- font-size:13px;
- padding:0 0 3px 0;
-}
-.indexContainer ul {
- margin:0;
- padding:0;
-}
-.indexContainer ul li {
- list-style:none;
- padding-top:2px;
-}
-.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
- font-size:12px;
- font-weight:bold;
- margin:10px 0 0 0;
- color:#4E4E4E;
-}
-.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
- margin:5px 0 10px 0px;
- font-size:14px;
- font-family:'DejaVu Sans Mono',monospace;
-}
-.serializedFormContainer dl.nameValue dt {
- margin-left:1px;
- font-size:1.1em;
- display:inline;
- font-weight:bold;
-}
-.serializedFormContainer dl.nameValue dd {
- margin:0 0 0 1px;
- font-size:1.1em;
- display:inline;
-}
-/*
-List styles
-*/
-ul.horizontal li {
- display:inline;
- font-size:0.9em;
-}
-ul.inheritance {
- margin:0;
- padding:0;
-}
-ul.inheritance li {
- display:inline;
- list-style:none;
-}
-ul.inheritance li ul.inheritance {
- margin-left:15px;
- padding-left:15px;
- padding-top:1px;
-}
-ul.blockList, ul.blockListLast {
- margin:10px 0 10px 0;
- padding:0;
-}
-ul.blockList li.blockList, ul.blockListLast li.blockList {
- list-style:none;
- margin-bottom:15px;
- line-height:1.4;
-}
-ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
- padding:0px 20px 5px 10px;
- border:1px solid #ededed;
- background-color:#f8f8f8;
-}
-ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
- padding:0 0 5px 8px;
- background-color:#ffffff;
- border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
- margin-left:0;
- padding-left:0;
- padding-bottom:15px;
- border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
- list-style:none;
- border-bottom:none;
- padding-bottom:0;
-}
-table tr td dl, table tr td dl dt, table tr td dl dd {
- margin-top:0;
- margin-bottom:1px;
-}
-/*
-Table styles
-*/
-.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
- width:100%;
- border-left:1px solid #EEE;
- border-right:1px solid #EEE;
- border-bottom:1px solid #EEE;
-}
-.overviewSummary, .memberSummary {
- padding:0px;
-}
-.overviewSummary caption, .memberSummary caption, .typeSummary caption,
-.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
- position:relative;
- text-align:left;
- background-repeat:no-repeat;
- color:#253441;
- font-weight:bold;
- clear:none;
- overflow:hidden;
- padding:0px;
- padding-top:10px;
- padding-left:1px;
- margin:0px;
- white-space:pre;
-}
-.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
-.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
-.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
-.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
-.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
-.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
-.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
-.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
- color:#FFFFFF;
-}
-.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- padding-bottom:7px;
- display:inline-block;
- float:left;
- background-color:#F8981D;
- border: none;
- height:16px;
-}
-.memberSummary caption span.activeTableTab span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- margin-right:3px;
- display:inline-block;
- float:left;
- background-color:#F8981D;
- height:16px;
-}
-.memberSummary caption span.tableTab span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- margin-right:3px;
- display:inline-block;
- float:left;
- background-color:#4D7A97;
- height:16px;
-}
-.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
- padding-top:0px;
- padding-left:0px;
- padding-right:0px;
- background-image:none;
- float:none;
- display:inline;
-}
-.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
- display:none;
- width:5px;
- position:relative;
- float:left;
- background-color:#F8981D;
-}
-.memberSummary .activeTableTab .tabEnd {
- display:none;
- width:5px;
- margin-right:3px;
- position:relative;
- float:left;
- background-color:#F8981D;
-}
-.memberSummary .tableTab .tabEnd {
- display:none;
- width:5px;
- margin-right:3px;
- position:relative;
- background-color:#4D7A97;
- float:left;
-
-}
-.overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td {
- text-align:left;
- padding:0px 0px 12px 10px;
-}
-th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
-td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
- vertical-align:top;
- padding-right:0px;
- padding-top:8px;
- padding-bottom:3px;
-}
-th.colFirst, th.colLast, th.colOne, .constantsSummary th {
- background:#dee3e9;
- text-align:left;
- padding:8px 3px 3px 7px;
-}
-td.colFirst, th.colFirst {
- white-space:nowrap;
- font-size:13px;
-}
-td.colLast, th.colLast {
- font-size:13px;
-}
-td.colOne, th.colOne {
- font-size:13px;
-}
-.overviewSummary td.colFirst, .overviewSummary th.colFirst,
-.useSummary td.colFirst, .useSummary th.colFirst,
-.overviewSummary td.colOne, .overviewSummary th.colOne,
-.memberSummary td.colFirst, .memberSummary th.colFirst,
-.memberSummary td.colOne, .memberSummary th.colOne,
-.typeSummary td.colFirst{
- width:25%;
- vertical-align:top;
-}
-td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
- font-weight:bold;
-}
-.tableSubHeadingColor {
- background-color:#EEEEFF;
-}
-.altColor {
- background-color:#FFFFFF;
-}
-.rowColor {
- background-color:#EEEEEF;
-}
-/*
-Content styles
-*/
-.description pre {
- margin-top:0;
-}
-.deprecatedContent {
- margin:0;
- padding:10px 0;
-}
-.docSummary {
- padding:0;
-}
-
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
- font-style:normal;
-}
-
-div.block {
- font-size:14px;
- font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-
-td.colLast div {
- padding-top:0px;
-}
-
-
-td.colLast a {
- padding-bottom:3px;
-}
-/*
-Formatting effect styles
-*/
-.sourceLineNo {
- color:green;
- padding:0 30px 0 0;
-}
-h1.hidden {
- visibility:hidden;
- overflow:hidden;
- font-size:10px;
-}
-.block {
- display:block;
- margin:3px 10px 2px 0px;
- color:#474747;
-}
-.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
-.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
-.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
- font-weight:bold;
-}
-.deprecationComment, .emphasizedPhrase, .interfaceName {
- font-style:italic;
-}
-
-div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
-div.block div.block span.interfaceName {
- font-style:normal;
-}
-
-div.contentContainer ul.blockList li.blockList h2{
- padding-bottom:0px;
-}
diff --git a/Lab5Client/build/libs/Lab5Client-2.2.jar b/Lab5Client/build/libs/Lab5Client-2.2.jar
deleted file mode 100644
index eb51353..0000000
Binary files a/Lab5Client/build/libs/Lab5Client-2.2.jar and /dev/null differ
diff --git a/Lab5Client/build/libs/Lab5Client-3.0.jar b/Lab5Client/build/libs/Lab5Client-3.0.jar
deleted file mode 100644
index e772b9a..0000000
Binary files a/Lab5Client/build/libs/Lab5Client-3.0.jar and /dev/null differ
diff --git a/Lab5Client/build/libs/connection.properties b/Lab5Client/build/libs/connection.properties
deleted file mode 100644
index 6c5a1f8..0000000
--- a/Lab5Client/build/libs/connection.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Changed by user
-#Sun Jun 19 16:53:07 MSK 2022
-port=2222
-hostname=localhost
diff --git a/Lab5Client/build/libs/connection.properties.bak b/Lab5Client/build/libs/connection.properties.bak
deleted file mode 100644
index f5630d4..0000000
--- a/Lab5Client/build/libs/connection.properties.bak
+++ /dev/null
@@ -1,2 +0,0 @@
-hostname=localhost
-port=1234
\ No newline at end of file
diff --git a/Lab5Client/build/libs/lab5.xml b/Lab5Client/build/libs/lab5.xml
deleted file mode 100644
index 9b16c6e..0000000
--- a/Lab5Client/build/libs/lab5.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- san
-
- 2.0
- 2.0
-
- 2022-05-16
- 321
- 321321321231
- BLACK
- CHINA
-
- 2.0
- 2.0
- 2
- 2
-
-
-
- wasd
-
- 2.0
- 2.0
-
- 2022-05-16
- 321
- 321321312321
- BLACK
- GERMANY
-
- 2.0
- 2.0
- 2
- 2
-
-
- 2022-03-22
-
diff --git a/Lab5Client/build/libs/lab5.xml.bak b/Lab5Client/build/libs/lab5.xml.bak
deleted file mode 100644
index 0f4e4ca..0000000
--- a/Lab5Client/build/libs/lab5.xml.bak
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
- 321321321
-
- 2.0
- 2.0
-
- 2022-04-18
- 321321
- 321312312
- BLACK
- CHINA
-
- 2.0
- 2.0
- 2
- w
-
-
-
- Gena
-
- 5.0
- 6.0
-
- 2022-04-18
- 124
- 231323232
- BLACK
- JAPAN
-
- 2.0
- 3.0
- 4
- Tokyo
-
-
-
- Sasha
-
- 3.4
- -2.0
-
- 2022-04-18
- 175
- 2312131231
- BROWN
- JAPAN
-
- 2323.0
- 443.0
- 2
- Tokyo
-
-
-
- w
-
- 2.0
- 2.0
-
- 2022-04-18
- 2
- 321321312
- ORANGE
- THAILAND
-
- 2.0
- 2.0
- 2
- 2
-
-
-
- w
-
- 2.0
- 2.0
-
- 2022-03-22
- 1
- wwwwwwwwwwww
- BLACK
- GERMANY
-
- 2.0
- 2.0
- 2
-
-
-
-
- w
-
- 2.0
- 2.0
-
- 2022-03-22
-
- wwwwwwwwwwwwwwwww
- BLACK
- CHINA
-
- 2.0
- 2.0
- 2
- w
-
-
-
- wasd
-
- 2.0
- 2.0
-
- 2022-04-18
- 2
- 2313213121
- BLACK
- GERMANY
-
- 2.0
- 2.0
- 2
- wasd
-
-
- 2022-03-22
-
diff --git a/Lab5Client/build/libs/run.bat b/Lab5Client/build/libs/run.bat
deleted file mode 100644
index b06d7dc..0000000
--- a/Lab5Client/build/libs/run.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-cls
-java -jar Lab5-1.0.jar
-pause
diff --git a/Lab5Client/build/libs/run.bat.bak b/Lab5Client/build/libs/run.bat.bak
deleted file mode 100644
index 0ac50be..0000000
--- a/Lab5Client/build/libs/run.bat.bak
+++ /dev/null
@@ -1,3 +0,0 @@
-cls
-java -jar Lab5-1.0.jar
-pause
\ No newline at end of file
diff --git a/Lab5Client/build/libs/script.txt b/Lab5Client/build/libs/script.txt
deleted file mode 100644
index f5115d2..0000000
--- a/Lab5Client/build/libs/script.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-show
-info
-add
-Gena
-124
-231323232
-black
-japan
-2
-3
-4
-Tokyo
-5
-6
-show
-execute_script script2.txt
-sum_of_height
-filter_contains_name e
\ No newline at end of file
diff --git a/Lab5Client/build/libs/script2.txt b/Lab5Client/build/libs/script2.txt
deleted file mode 100644
index f89072a..0000000
--- a/Lab5Client/build/libs/script2.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-add
-Sasha
-175
-2312131231
-brown
-japan
-2323
-443
-2
-Tokyo
-3.4
--2
-execute_script script.txt
-show
-print_field_descending_location
\ No newline at end of file
diff --git a/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin
deleted file mode 100644
index d116929..0000000
Binary files a/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ
diff --git a/Lab5Client/build/tmp/jar/MANIFEST.MF b/Lab5Client/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index 012a17f..0000000
--- a/Lab5Client/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: client.Lab5Client
-
diff --git a/Lab5Client/build/tmp/javadoc/javadoc.options b/Lab5Client/build/tmp/javadoc/javadoc.options
deleted file mode 100644
index 7854308..0000000
--- a/Lab5Client/build/tmp/javadoc/javadoc.options
+++ /dev/null
@@ -1,10 +0,0 @@
--classpath 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\build\\classes\\java\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\build\\resources\\main;C:\\Users\\egor\\.gradle\\caches\\modules-2\\files-2.1\\org.projectlombok\\lombok\\1.18.24\\13a394eed5c4f9efb2a6d956e2086f1d81e857d9\\lombok-1.18.24.jar;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\libs\\Lab5Core-3.0.jar'
--d 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\build\\docs\\javadoc'
--doctitle 'Lab5Client 3.0 API'
--encoding 'UTF-8'
--notimestamp
--quiet
--windowtitle 'Lab5Client 3.0 API'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\src\\main\\java\\client\\commandline\\CommandLineHandlerClient.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\src\\main\\java\\client\\Lab5Client.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\src\\main\\java\\client\\net\\UDPClient.java'
diff --git a/Lab5Client/build/tmp/shadowJar/MANIFEST.MF b/Lab5Client/build/tmp/shadowJar/MANIFEST.MF
deleted file mode 100644
index 012a17f..0000000
--- a/Lab5Client/build/tmp/shadowJar/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: client.Lab5Client
-
diff --git a/Lab5Client/src/main/java/client/commandline/CommandLineHandlerClient.java b/Lab5Client/src/main/java/client/commandline/CommandLineHandlerClient.java
index 1863aef..49f58fb 100644
--- a/Lab5Client/src/main/java/client/commandline/CommandLineHandlerClient.java
+++ b/Lab5Client/src/main/java/client/commandline/CommandLineHandlerClient.java
@@ -4,6 +4,7 @@ import client.Lab5Client;
import common.commandline.Command;
import common.commandline.CommandLineHandler;
import common.commandline.CommandRegistry;
+import common.commandline.commands.EmulateWork;
import common.commandline.pdcommands.*;
import common.commandline.response.CommandResult;
import common.commandline.response.DefaultResponse;
@@ -16,7 +17,7 @@ public final class CommandLineHandlerClient extends CommandLineHandler {
super();
CommandRegistry.registerCommands(new InfoCommand(), new ShowCommand(), new AddCommand(), new AddIfMaxCommand(),
new AddIfMinCommand(), new ClearCommand(), new FilterContainsNameCommand(), new PrintFieldDescendingLocationCommand(),
- new RemoveByIdCommand(), new SumOfHeightCommand(), new UpdateCommand());
+ new RemoveByIdCommand(), new SumOfHeightCommand(), new UpdateCommand(), new EmulateWork());
}
public static CommandLineHandler getClientCommandLine() {
diff --git a/Lab5Client/src/main/java/client/net/UDPClient.java b/Lab5Client/src/main/java/client/net/UDPClient.java
index 8ac813d..d02ef57 100644
--- a/Lab5Client/src/main/java/client/net/UDPClient.java
+++ b/Lab5Client/src/main/java/client/net/UDPClient.java
@@ -40,8 +40,8 @@ public class UDPClient {
private DatagramChannel datagramChannel;
private final static String LOCALHOST = "localhost";
private final static int BUFFER_SIZE = 65_535,
- TIMES_TO_TRY_READ = 10,
- READ_ATTEMPT_DELAY_MS = 500;
+ TIMES_TO_TRY_READ = 20,
+ READ_ATTEMPT_DELAY_MS = 1000;
public UDPClient(int port) {
this.port = port;
diff --git a/Lab5Core/.gitignore b/Lab5Core/.gitignore
new file mode 100644
index 0000000..8a0a60d
--- /dev/null
+++ b/Lab5Core/.gitignore
@@ -0,0 +1,4 @@
+# Project exclude paths
+/.gradle/
+/build/
+/build/classes/java/main/
\ No newline at end of file
diff --git a/Lab5Core/build/classes/java/main/common/commandline/Command.class b/Lab5Core/build/classes/java/main/common/commandline/Command.class
deleted file mode 100644
index 4917d55..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/Command.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$CommandLineNotInitialized.class b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$CommandLineNotInitialized.class
deleted file mode 100644
index 57b2fe0..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$CommandLineNotInitialized.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$ExecuteScriptCommand.class b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$ExecuteScriptCommand.class
deleted file mode 100644
index 17d04b1..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$ExecuteScriptCommand.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$ExitCommand.class b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$ExitCommand.class
deleted file mode 100644
index e31ea46..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$ExitCommand.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$HistoryCommand.class b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$HistoryCommand.class
deleted file mode 100644
index c999554..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$HistoryCommand.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler.class b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler.class
deleted file mode 100644
index 071adcb..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$1.class b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$1.class
deleted file mode 100644
index 3ebeaae..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$1.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$CommandAlreadyExistsException.class b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$CommandAlreadyExistsException.class
deleted file mode 100644
index 6fd9b56..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$CommandAlreadyExistsException.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$CommandNotFoundException.class b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$CommandNotFoundException.class
deleted file mode 100644
index 254c900..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$CommandNotFoundException.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$HelpCommand.class b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$HelpCommand.class
deleted file mode 100644
index c35d00a..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$HelpCommand.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry.class b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry.class
deleted file mode 100644
index cab51c2..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/LongStrings.class b/Lab5Core/build/classes/java/main/common/commandline/LongStrings.class
deleted file mode 100644
index 9325f45..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/LongStrings.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/pdcommands/PeopleDatabaseCommand.class b/Lab5Core/build/classes/java/main/common/commandline/pdcommands/PeopleDatabaseCommand.class
deleted file mode 100644
index 33b45c6..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/pdcommands/PeopleDatabaseCommand.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/pdcommands/PeopleDatabaseCommands.class b/Lab5Core/build/classes/java/main/common/commandline/pdcommands/PeopleDatabaseCommands.class
deleted file mode 100644
index d5db67c..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/pdcommands/PeopleDatabaseCommands.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/response/CommandResult.class b/Lab5Core/build/classes/java/main/common/commandline/response/CommandResult.class
deleted file mode 100644
index 7d55a03..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/response/CommandResult.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/response/DefaultResponse.class b/Lab5Core/build/classes/java/main/common/commandline/response/DefaultResponse.class
deleted file mode 100644
index e9b010f..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/response/DefaultResponse.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/response/PeopleDatabaseResponse.class b/Lab5Core/build/classes/java/main/common/commandline/response/PeopleDatabaseResponse.class
deleted file mode 100644
index c956890..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/response/PeopleDatabaseResponse.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/response/Response.class b/Lab5Core/build/classes/java/main/common/commandline/response/Response.class
deleted file mode 100644
index 4f5dd76..0000000
Binary files a/Lab5Core/build/classes/java/main/common/commandline/response/Response.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/data/Color.class b/Lab5Core/build/classes/java/main/common/data/Color.class
deleted file mode 100644
index 96a17b5..0000000
Binary files a/Lab5Core/build/classes/java/main/common/data/Color.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/data/Coordinates.class b/Lab5Core/build/classes/java/main/common/data/Coordinates.class
deleted file mode 100644
index 274b4f0..0000000
Binary files a/Lab5Core/build/classes/java/main/common/data/Coordinates.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/data/Country.class b/Lab5Core/build/classes/java/main/common/data/Country.class
deleted file mode 100644
index 6283421..0000000
Binary files a/Lab5Core/build/classes/java/main/common/data/Country.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/data/Location.class b/Lab5Core/build/classes/java/main/common/data/Location.class
deleted file mode 100644
index 0327b7c..0000000
Binary files a/Lab5Core/build/classes/java/main/common/data/Location.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/data/Person.class b/Lab5Core/build/classes/java/main/common/data/Person.class
deleted file mode 100644
index 876104a..0000000
Binary files a/Lab5Core/build/classes/java/main/common/data/Person.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/net/ConnectionProperties.class b/Lab5Core/build/classes/java/main/common/net/ConnectionProperties.class
deleted file mode 100644
index a3407ad..0000000
Binary files a/Lab5Core/build/classes/java/main/common/net/ConnectionProperties.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/util/UtilFunctions$1.class b/Lab5Core/build/classes/java/main/common/util/UtilFunctions$1.class
deleted file mode 100644
index 6e1262b..0000000
Binary files a/Lab5Core/build/classes/java/main/common/util/UtilFunctions$1.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/util/UtilFunctions.class b/Lab5Core/build/classes/java/main/common/util/UtilFunctions.class
deleted file mode 100644
index e4d4945..0000000
Binary files a/Lab5Core/build/classes/java/main/common/util/UtilFunctions.class and /dev/null differ
diff --git a/Lab5Core/build/docs/javadoc/allclasses-frame.html b/Lab5Core/build/docs/javadoc/allclasses-frame.html
deleted file mode 100644
index 77a70ab..0000000
--- a/Lab5Core/build/docs/javadoc/allclasses-frame.html
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-All Classes (Lab5Core 3.0 API)
-
-
-
-
-All Classes
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/allclasses-noframe.html b/Lab5Core/build/docs/javadoc/allclasses-noframe.html
deleted file mode 100644
index 690717f..0000000
--- a/Lab5Core/build/docs/javadoc/allclasses-noframe.html
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-All Classes (Lab5Core 3.0 API)
-
-
-
-
-All Classes
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/collection/package-frame.html b/Lab5Core/build/docs/javadoc/common/collection/package-frame.html
deleted file mode 100644
index a0c071d..0000000
--- a/Lab5Core/build/docs/javadoc/common/collection/package-frame.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-common.collection (Lab5Core 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/collection/package-summary.html b/Lab5Core/build/docs/javadoc/common/collection/package-summary.html
deleted file mode 100644
index 07dbae3..0000000
--- a/Lab5Core/build/docs/javadoc/common/collection/package-summary.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-common.collection (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/collection/package-tree.html b/Lab5Core/build/docs/javadoc/common/collection/package-tree.html
deleted file mode 100644
index dc37035..0000000
--- a/Lab5Core/build/docs/javadoc/common/collection/package-tree.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-common.collection Class Hierarchy (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/Command.html b/Lab5Core/build/docs/javadoc/common/commandline/Command.html
deleted file mode 100644
index a3261d4..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/Command.html
+++ /dev/null
@@ -1,360 +0,0 @@
-
-
-
-
-
-Command (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.commandline.Command
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-Fields
-
-Modifier and Type
-Field and Description
-
-
-protected java.lang.String
-alias
-
-
-protected boolean
-clientOnly
-
-
-protected java.lang.String
-description
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-Command (java.lang.String alias,
- boolean clientOnly,
- java.lang.String description)
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.CommandLineNotInitialized.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.CommandLineNotInitialized.html
deleted file mode 100644
index 0654da7..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.CommandLineNotInitialized.html
+++ /dev/null
@@ -1,280 +0,0 @@
-
-
-
-
-
-CommandLineHandler.CommandLineNotInitialized (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-java.lang.Throwable
-
-
-java.lang.Exception
-
-
-java.lang.RuntimeException
-
-
-common.commandline.CommandLineHandler.CommandLineNotInitialized
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-Methods inherited from class java.lang.Throwable
-addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExecuteScriptCommand.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExecuteScriptCommand.html
deleted file mode 100644
index a5236bc..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExecuteScriptCommand.html
+++ /dev/null
@@ -1,321 +0,0 @@
-
-
-
-
-
-CommandLineHandler.ExecuteScriptCommand (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
-
-
-
-
-
-
-Constructor Summary
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExitCommand.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExitCommand.html
deleted file mode 100644
index d7a586d..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExitCommand.html
+++ /dev/null
@@ -1,311 +0,0 @@
-
-
-
-
-
-CommandLineHandler.ExitCommand (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-ExitCommand ()
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-ExitCommand
-public ExitCommand()
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.HistoryCommand.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.HistoryCommand.html
deleted file mode 100644
index 8dad4c2..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.HistoryCommand.html
+++ /dev/null
@@ -1,321 +0,0 @@
-
-
-
-
-
-CommandLineHandler.HistoryCommand (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-HistoryCommand ()
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-HistoryCommand
-public HistoryCommand()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.html
deleted file mode 100644
index 0acf6d5..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.html
+++ /dev/null
@@ -1,644 +0,0 @@
-
-
-
-
-
-CommandLineHandler (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.commandline.CommandLineHandler
-
-
-
-
-
-
-
-
-
-
-
-
-Nested Class Summary
-
-
-
-
-
-
-
-
-Field Summary
-
-Fields
-
-Modifier and Type
-Field and Description
-
-
-protected java.util.Deque<java.lang.String>
-fileNames
-
-
-protected java.util.List<java.lang.String>
-history
-
-
-protected java.util.Deque<java.io.Reader>
-inputs
-
-
-protected static CommandLineHandler
-instance
-
-
-protected boolean
-isActive
-
-
-protected java.io.BufferedReader
-reader
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-
-
-
-
-
-
-
-Method Summary
-
-All Methods Static Methods Instance Methods Abstract Methods Concrete Methods
-
-Modifier and Type
-Method and Description
-
-
-void
-addNewInput (java.io.Reader reader,
- java.lang.String filePath)
-
-
-java.lang.String
-awaitInput (java.lang.String msg)
-
-
-java.lang.String
-awaitInput (java.lang.String msg,
- java.lang.String err)
-Метод, ожидающий ввода из потока ввода
reader
и возвращающий результат,
- печатает запрос msg перед ожиданием данных (если их вводит пользователь),
- печатает ошибку err, если при вводе данных произошла ошибка
-
-
-
-java.lang.String
-awaitInput (java.lang.String msg,
- java.lang.String err,
- java.util.function.Predicate<java.lang.String> predicate)
-Метод, ожидающий ввода из потока ввода
reader
и возвращающий результат,
- печатает запрос msg перед ожиданием данных (если их вводит пользователь),
- печатает ошибку err, если введенные данные не соответствуют предикату predicate
-
-
-
-<T> T
-awaitInput (java.lang.String msg,
- java.lang.String err,
- java.util.function.Predicate<java.lang.String> predicate,
- java.util.function.Function<java.lang.String,T> transform)
-Метод, ожидающий ввода из потока ввода
reader
и возвращающий результат,
- печатает запрос msg перед ожиданием данных (если их вводит пользователь),
- печатает ошибку err, если введенные данные не соответствуют предикату predicate,
- преобразует результат в тип T в соответствии с функцией transform
-
-
-
-java.lang.String
-awaitPassword (java.lang.String msg)
-
-
-static void
-clearScreen ()
-
-
-protected abstract void
-executeCommand (java.lang.String alias,
- java.lang.String[] args)
-
-
-static CommandLineHandler
-getInstance ()
-
-
-protected void
-input ()
-
-
-boolean
-isActive ()
-
-
-void
-removeInput ()
-
-
-void
-start ()
-Метод, запускающий обработчик командной строки, для остановки требуется ввести команду "exit"
-
-
-
-protected void
-updateHistory (java.lang.String command)
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-input
-protected void input()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-awaitInput
-public <T> T awaitInput(java.lang.String msg,
- java.lang.String err,
- java.util.function.Predicate<java.lang.String> predicate,
- java.util.function.Function<java.lang.String,T> transform)
-Метод, ожидающий ввода из потока ввода
reader
и возвращающий результат,
- печатает запрос msg перед ожиданием данных (если их вводит пользователь),
- печатает ошибку err, если введенные данные не соответствуют предикату predicate,
- преобразует результат в тип T в соответствии с функцией transform
-
-Type Parameters:
-T
- Тип, к которому будет приведен результат
-Parameters:
-msg
- Строка, печатающаяся как запрос данных от пользователя
-err
- Строка, печатающаяся при несоответствии ввода предикату
-predicate
- Предикат, определяющий валидность введенных данных
-transform
- Функция, преобразующая результат в тип T
-Returns:
-Результат типа T
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandAlreadyExistsException.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandAlreadyExistsException.html
deleted file mode 100644
index 9c7181f..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandAlreadyExistsException.html
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
-
-
-CommandRegistry.CommandAlreadyExistsException (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-Summary:
-Nested |
-Field |
-Constr |
-Method
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-java.lang.Throwable
-
-
-java.lang.Exception
-
-
-java.lang.RuntimeException
-
-
-common.commandline.CommandRegistry.CommandAlreadyExistsException
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-Methods inherited from class java.lang.Throwable
-addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Summary:
-Nested |
-Field |
-Constr |
-Method
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandNotFoundException.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandNotFoundException.html
deleted file mode 100644
index e3ea560..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandNotFoundException.html
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
-
-
-CommandRegistry.CommandNotFoundException (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-Summary:
-Nested |
-Field |
-Constr |
-Method
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-java.lang.Throwable
-
-
-java.lang.Exception
-
-
-java.lang.RuntimeException
-
-
-common.commandline.CommandRegistry.CommandNotFoundException
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-Methods inherited from class java.lang.Throwable
-addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Summary:
-Nested |
-Field |
-Constr |
-Method
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.HelpCommand.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.HelpCommand.html
deleted file mode 100644
index 5025f61..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.HelpCommand.html
+++ /dev/null
@@ -1,311 +0,0 @@
-
-
-
-
-
-CommandRegistry.HelpCommand (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-HelpCommand ()
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-HelpCommand
-public HelpCommand()
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.html
deleted file mode 100644
index 8e997aa..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.html
+++ /dev/null
@@ -1,314 +0,0 @@
-
-
-
-
-
-CommandRegistry (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.commandline.CommandRegistry
-
-
-
-
-
-
-
-
-public final class CommandRegistry
-extends java.lang.Object
-Класс регистра команд, используемый для добавления, переопределения или удаления команд
-
-
-
-
-
-
-
-
-
-
-
-Nested Class Summary
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html b/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html
deleted file mode 100644
index 9b0e4ea..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html
+++ /dev/null
@@ -1,351 +0,0 @@
-
-
-
-
-
-LongStrings (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-java.lang.Enum<LongStrings >
-
-
-common.commandline.LongStrings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Enum Constant Summary
-
-Enum Constants
-
-Enum Constant and Description
-
-
-GREETINGS
-
-
-LINE
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Enum
-clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
-
-
-
-
-
-Methods inherited from class java.lang.Object
-getClass, notify, notifyAll, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Enum Constant Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-valueOf
-public static LongStrings valueOf(java.lang.String name)
-Returns the enum constant of this type with the specified name.
-The string must match exactly an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-
-Parameters:
-name
- the name of the enum constant to be returned.
-Returns:
-the enum constant with the specified name
-Throws:
-java.lang.IllegalArgumentException
- if this enum type has no constant with the specified name
-java.lang.NullPointerException
- if the argument is null
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html b/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html
deleted file mode 100644
index 8b2107c..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-common.commandline (Lab5Core 3.0 API)
-
-
-
-
-
-
-
Classes
-
-
Enums
-
-
Exceptions
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html b/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html
deleted file mode 100644
index 3d1388a..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html
+++ /dev/null
@@ -1,199 +0,0 @@
-
-
-
-
-
-common.commandline (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-Class Summary
-
-Class
-Description
-
-
-
-Command
-
-
-
-CommandLineHandler
-
-Класс обработчика командной строки, реализует шаблон проектирования Singleton,
- читает ввод с командной строки, обрабатывает его и вызывает соответствующую команду
- на выполнение из регистра команд, используйте метод
CommandLineHandler.start()
для его запуска
-
-
-
-CommandRegistry
-
-Класс регистра команд, используемый для добавления, переопределения или удаления команд
-
-
-
-CommandRegistry.HelpCommand
-
-
-
-PlaceHolder <T>
-
-
-
-
-
-
-
-Enum Summary
-
-Enum
-Description
-
-
-
-LongStrings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html
deleted file mode 100644
index 44c7b0b..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
-
-common.commandline Class Hierarchy (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
Class Hierarchy
-
-java.lang.Object
-
-common.commandline.Command (implements java.io.Serializable)
-
-
-common.commandline.CommandLineHandler
-common.commandline.CommandRegistry
-common.commandline.PlaceHolder <T> (implements java.io.Serializable)
-java.lang.Throwable (implements java.io.Serializable)
-
-java.lang.Exception
-
-java.lang.RuntimeException
-
-
-
-
-
-
-
-
-
-
Enum Hierarchy
-
-java.lang.Object
-
-java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommand.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommand.html
deleted file mode 100644
index b5e138d..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommand.html
+++ /dev/null
@@ -1,311 +0,0 @@
-
-
-
-
-
-PeopleDatabaseCommand (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-PeopleDatabaseCommand (java.lang.String alias,
- boolean clientOnly,
- java.lang.String description)
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommands.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommands.html
deleted file mode 100644
index 01ef95b..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommands.html
+++ /dev/null
@@ -1,301 +0,0 @@
-
-
-
-
-
-PeopleDatabaseCommands (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.commandline.pdcommands.PeopleDatabaseCommands
-
-
-
-
-
-
-
-
-public final class PeopleDatabaseCommands
-extends java.lang.Object
-Класс объявления всех команд, связанных с манипуляциями над объектом класса PeopleDatabase
-
-See Also:
-PeopleCollection
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Field Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-frame.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-frame.html
deleted file mode 100644
index 2f298bb..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-frame.html
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-common.commandline.pdcommands (Lab5Core 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-summary.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-summary.html
deleted file mode 100644
index 99cc6ac..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-summary.html
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-
-
-common.commandline.pdcommands (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-tree.html
deleted file mode 100644
index 2bb5e90..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-tree.html
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
-
-common.commandline.pdcommands Class Hierarchy (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html b/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html
deleted file mode 100644
index ca803b8..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html
+++ /dev/null
@@ -1,292 +0,0 @@
-
-
-
-
-
-CommandResult (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.commandline.response.CommandResult
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-CommandResult (java.lang.String value,
- Response response)
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html b/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html
deleted file mode 100644
index 8ed8f42..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html
+++ /dev/null
@@ -1,428 +0,0 @@
-
-
-
-
-
-DefaultResponse (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-java.lang.Enum<DefaultResponse >
-
-
-common.commandline.response.DefaultResponse
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Enum Constant Summary
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Enum
-clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
-
-
-
-
-
-Methods inherited from class java.lang.Object
-getClass, notify, notifyAll, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-valueOf
-public static DefaultResponse valueOf(java.lang.String name)
-Returns the enum constant of this type with the specified name.
-The string must match exactly an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-
-Parameters:
-name
- the name of the enum constant to be returned.
-Returns:
-the enum constant with the specified name
-Throws:
-java.lang.IllegalArgumentException
- if this enum type has no constant with the specified name
-java.lang.NullPointerException
- if the argument is null
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html b/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html
deleted file mode 100644
index 730afb2..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html
+++ /dev/null
@@ -1,368 +0,0 @@
-
-
-
-
-
-PeopleDatabaseResponse (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Enum Constant Summary
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Enum
-clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
-
-
-
-
-
-Methods inherited from class java.lang.Object
-getClass, notify, notifyAll, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-valueOf
-public static PeopleDatabaseResponse valueOf(java.lang.String name)
-Returns the enum constant of this type with the specified name.
-The string must match exactly an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-
-Parameters:
-name
- the name of the enum constant to be returned.
-Returns:
-the enum constant with the specified name
-Throws:
-java.lang.IllegalArgumentException
- if this enum type has no constant with the specified name
-java.lang.NullPointerException
- if the argument is null
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html b/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html
deleted file mode 100644
index 9f2af3e..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html
+++ /dev/null
@@ -1,227 +0,0 @@
-
-
-
-
-
-Response (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-Summary:
-Nested |
-Field |
-Constr |
-Method
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Summary:
-Nested |
-Field |
-Constr |
-Method
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html
deleted file mode 100644
index fa2e7b1..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-common.commandline.response (Lab5Core 3.0 API)
-
-
-
-
-
-
-
Interfaces
-
-
Classes
-
-
Enums
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html
deleted file mode 100644
index df00bc7..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
-
-common.commandline.response (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-Interface Summary
-
-Interface
-Description
-
-
-
-Response
-
-
-
-
-
-
-
-Class Summary
-
-Class
-Description
-
-
-
-CommandResult
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html
deleted file mode 100644
index 02ded49..0000000
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
-
-
-common.commandline.response Class Hierarchy (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
Class Hierarchy
-
-java.lang.Object
-
-common.commandline.response.CommandResult (implements java.io.Serializable)
-
-
-
-
Interface Hierarchy
-
-java.io.Serializable
-
-
-
-
Enum Hierarchy
-
-java.lang.Object
-
-java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/data/Color.html b/Lab5Core/build/docs/javadoc/common/data/Color.html
deleted file mode 100644
index ce9bbad..0000000
--- a/Lab5Core/build/docs/javadoc/common/data/Color.html
+++ /dev/null
@@ -1,352 +0,0 @@
-
-
-
-
-
-Color (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-java.lang.Enum<Color >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Enum Constant Summary
-
-Enum Constants
-
-Enum Constant and Description
-
-
-BLACK
-
-
-BROWN
-
-
-ORANGE
-
-
-
-
-
-
-
-
-
-Method Summary
-
-All Methods Static Methods Concrete Methods
-
-Modifier and Type
-Method and Description
-
-
-static Color
-valueOf (java.lang.String name)
-Returns the enum constant of this type with the specified name.
-
-
-
-static Color []
-values ()
-Returns an array containing the constants of this enum type, in
-the order they are declared.
-
-
-
-
-
-
-
-Methods inherited from class java.lang.Enum
-clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
-
-
-
-
-
-Methods inherited from class java.lang.Object
-getClass, notify, notifyAll, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-valueOf
-public static Color valueOf(java.lang.String name)
-Returns the enum constant of this type with the specified name.
-The string must match exactly an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-
-Parameters:
-name
- the name of the enum constant to be returned.
-Returns:
-the enum constant with the specified name
-Throws:
-java.lang.IllegalArgumentException
- if this enum type has no constant with the specified name
-java.lang.NullPointerException
- if the argument is null
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/data/Coordinates.html b/Lab5Core/build/docs/javadoc/common/data/Coordinates.html
deleted file mode 100644
index 569961e..0000000
--- a/Lab5Core/build/docs/javadoc/common/data/Coordinates.html
+++ /dev/null
@@ -1,292 +0,0 @@
-
-
-
-
-
-Coordinates (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.data.Coordinates
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-Coordinates (float x,
- float y)
-Конструктор с параметрами
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/data/Country.html b/Lab5Core/build/docs/javadoc/common/data/Country.html
deleted file mode 100644
index a33e104..0000000
--- a/Lab5Core/build/docs/javadoc/common/data/Country.html
+++ /dev/null
@@ -1,376 +0,0 @@
-
-
-
-
-
-Country (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Enum Constant Summary
-
-
-
-
-
-
-
-
-Method Summary
-
-All Methods Static Methods Concrete Methods
-
-Modifier and Type
-Method and Description
-
-
-static Country
-valueOf (java.lang.String name)
-Returns the enum constant of this type with the specified name.
-
-
-
-static Country []
-values ()
-Returns an array containing the constants of this enum type, in
-the order they are declared.
-
-
-
-
-
-
-
-Methods inherited from class java.lang.Enum
-clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
-
-
-
-
-
-Methods inherited from class java.lang.Object
-getClass, notify, notifyAll, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-valueOf
-public static Country valueOf(java.lang.String name)
-Returns the enum constant of this type with the specified name.
-The string must match exactly an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-
-Parameters:
-name
- the name of the enum constant to be returned.
-Returns:
-the enum constant with the specified name
-Throws:
-java.lang.IllegalArgumentException
- if this enum type has no constant with the specified name
-java.lang.NullPointerException
- if the argument is null
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/data/Location.html b/Lab5Core/build/docs/javadoc/common/data/Location.html
deleted file mode 100644
index ef45521..0000000
--- a/Lab5Core/build/docs/javadoc/common/data/Location.html
+++ /dev/null
@@ -1,310 +0,0 @@
-
-
-
-
-
-Location (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-All Implemented Interfaces:
-java.io.Serializable, java.lang.Comparable<Location >
-
-
-
-public class Location
-extends java.lang.Object
-implements java.lang.Comparable<Location >, java.io.Serializable
-Класс данных местоположения, реализует сортировку по умолчанию
- по имени и расстоянию до точки (0; 0; 0)
-
-See Also:
-Serialized Form
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-Location (double x,
- float y,
- long z,
- java.lang.String name)
-Конструктор с параметрами
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-All Methods Instance Methods Concrete Methods
-
-Modifier and Type
-Method and Description
-
-
-int
-compareTo (Location other)
-Переопределенный метод сравнения двух местоположений,
- сравнение производится по имени локации и расстоянию до точки (0; 0; 0)
-
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-Location
-public Location(double x,
- float y,
- long z,
- java.lang.String name)
-Конструктор с параметрами
-
-Parameters:
-x
- Координата X
-y
- Координата Y
-z
- Координата Z
-name
- Имя локации
-Throws:
-java.lang.NullPointerException
- будет брошено в случае, если Z является null
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-compareTo
-public int compareTo(Location other)
-Переопределенный метод сравнения двух местоположений,
- сравнение производится по имени локации и расстоянию до точки (0; 0; 0)
-
-Specified by:
-compareTo
in interface java.lang.Comparable<Location >
-Parameters:
-other
- Объект для сравнения
-Returns:
-Целое число - результат сравнения
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/data/Person.html b/Lab5Core/build/docs/javadoc/common/data/Person.html
deleted file mode 100644
index 176c144..0000000
--- a/Lab5Core/build/docs/javadoc/common/data/Person.html
+++ /dev/null
@@ -1,396 +0,0 @@
-
-
-
-
-
-Person (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-All Implemented Interfaces:
-java.io.Serializable, java.lang.Comparable<Person >
-
-
-
-public class Person
-extends java.lang.Object
-implements java.lang.Comparable<Person >, java.io.Serializable
-Класс данных человека, реализует сортировку по умолчанию по имени, номеру паспорта,
- росту, национальности, местоположению и цвету глаз
-
-See Also:
-Serialized Form
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-Person (long id,
- @NonNull java.lang.String name,
- @NonNull Coordinates coordinates,
- java.lang.Integer height,
- java.lang.String passportID,
- @NonNull Color eyeColor,
- @NonNull Country nationality,
- Location location,
- java.lang.String owner)
-Конструктор с параметрами
-
-
-
-Person (@NonNull java.lang.String name,
- @NonNull Coordinates coordinates,
- java.lang.Integer height,
- java.lang.String passportID,
- @NonNull Color eyeColor,
- @NonNull Country nationality,
- Location location,
- java.lang.String owner)
-
-
-
-
-
-
-
-
-
-Method Summary
-
-All Methods Instance Methods Concrete Methods
-
-Modifier and Type
-Method and Description
-
-
-int
-compareTo (Person other)
-Переопределенный метод сравнения двух людей,
- сравнение производится по имени, номеру паспорта,
- росту, национальности, местоположению и цвету глаз
-
-
-
-java.lang.String
-formatted ()
-
-
-void
-update (Person newPerson)
-Метод, меняющий все значения полей человека (кроме
id
и
creationDate
) в соответствии
- со значениями полей другого
-
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-Person
-public Person(long id,
- @NonNull
- @NonNull java.lang.String name,
- @NonNull
- @NonNull Coordinates coordinates,
- java.lang.Integer height,
- java.lang.String passportID,
- @NonNull
- @NonNull Color eyeColor,
- @NonNull
- @NonNull Country nationality,
- Location location,
- java.lang.String owner)
-Конструктор с параметрами
-
-Parameters:
-id
- Id человека
-name
- Имя человека
-coordinates
- Координаты человека
-height
- Высота человека
-passportID
- Номер паспорта человека
-eyeColor
- Цвет глаз человека
-nationality
- Национальность человека
-location
- Местоположение человека
-owner
- Создатель человека
-Throws:
-java.lang.NullPointerException
- Если name, coordinates, eyeColor или nationality являются null
-
-
-
-
-
-
-
-
-Person
-public Person(@NonNull
- @NonNull java.lang.String name,
- @NonNull
- @NonNull Coordinates coordinates,
- java.lang.Integer height,
- java.lang.String passportID,
- @NonNull
- @NonNull Color eyeColor,
- @NonNull
- @NonNull Country nationality,
- Location location,
- java.lang.String owner)
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-compareTo
-public int compareTo(Person other)
-Переопределенный метод сравнения двух людей,
- сравнение производится по имени, номеру паспорта,
- росту, национальности, местоположению и цвету глаз
-
-Specified by:
-compareTo
in interface java.lang.Comparable<Person >
-Parameters:
-other
- Объект для сравнения
-Returns:
-Целое число - результат сравнения
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-frame.html b/Lab5Core/build/docs/javadoc/common/data/package-frame.html
deleted file mode 100644
index 253e7c8..0000000
--- a/Lab5Core/build/docs/javadoc/common/data/package-frame.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-common.data (Lab5Core 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-summary.html b/Lab5Core/build/docs/javadoc/common/data/package-summary.html
deleted file mode 100644
index f24abeb..0000000
--- a/Lab5Core/build/docs/javadoc/common/data/package-summary.html
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-
-
-
-common.data (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-Class Summary
-
-Class
-Description
-
-
-
-Coordinates
-
-Класс данных координат
-
-
-
-Location
-
-Класс данных местоположения, реализует сортировку по умолчанию
- по имени и расстоянию до точки (0; 0; 0)
-
-
-
-Person
-
-Класс данных человека, реализует сортировку по умолчанию по имени, номеру паспорта,
- росту, национальности, местоположению и цвету глаз
-
-
-
-
-
-
-
-Enum Summary
-
-Enum
-Description
-
-
-
-Color
-
-Перечисление цветов
-
-
-
-Country
-
-Перечисление стран
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-tree.html b/Lab5Core/build/docs/javadoc/common/data/package-tree.html
deleted file mode 100644
index 5127840..0000000
--- a/Lab5Core/build/docs/javadoc/common/data/package-tree.html
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
-
-common.data Class Hierarchy (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
Class Hierarchy
-
-java.lang.Object
-
-common.data.Coordinates (implements java.lang.Comparable<T>, java.io.Serializable)
-common.data.Location (implements java.lang.Comparable<T>, java.io.Serializable)
-common.data.Person (implements java.lang.Comparable<T>, java.io.Serializable)
-
-
-
-
Enum Hierarchy
-
-java.lang.Object
-
-java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-
-common.data.Color (implements java.io.Serializable)
-common.data.Country (implements java.io.Serializable)
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/net/ConnectionProperties.html b/Lab5Core/build/docs/javadoc/common/net/ConnectionProperties.html
deleted file mode 100644
index c5f85f0..0000000
--- a/Lab5Core/build/docs/javadoc/common/net/ConnectionProperties.html
+++ /dev/null
@@ -1,471 +0,0 @@
-
-
-
-
-
-ConnectionProperties (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.net.ConnectionProperties
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-
-
-
-
-
-
-
-Constructor Summary
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/net/package-frame.html b/Lab5Core/build/docs/javadoc/common/net/package-frame.html
deleted file mode 100644
index 9cb13fb..0000000
--- a/Lab5Core/build/docs/javadoc/common/net/package-frame.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-common.net (Lab5Core 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/net/package-summary.html b/Lab5Core/build/docs/javadoc/common/net/package-summary.html
deleted file mode 100644
index d4055b8..0000000
--- a/Lab5Core/build/docs/javadoc/common/net/package-summary.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-common.net (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/net/package-tree.html b/Lab5Core/build/docs/javadoc/common/net/package-tree.html
deleted file mode 100644
index f620368..0000000
--- a/Lab5Core/build/docs/javadoc/common/net/package-tree.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-common.net Class Hierarchy (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html b/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html
deleted file mode 100644
index 593c39d..0000000
--- a/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html
+++ /dev/null
@@ -1,332 +0,0 @@
-
-
-
-
-
-UtilFunctions (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-Summary:
-Nested |
-Field |
-Constr |
-Method
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.util.UtilFunctions
-
-
-
-
-
-
-
-
-
-
-
-
-Method Summary
-
-All Methods Static Methods Concrete Methods
-
-Modifier and Type
-Method and Description
-
-
-static java.lang.String
-allLowerFirstCapital (java.lang.String str)
-
-
-static java.lang.Object[]
-appendObjects (java.lang.Object[] array,
- java.lang.Object... objects)
-
-
-static java.lang.Double
-doubleOrNull (java.lang.String number)
-
-
-static <T extends java.lang.Enum<T>> T
-enumOrNull (java.lang.String value,
- java.lang.Class<T> enumType)
-
-
-static java.lang.Float
-floatOrNull (java.lang.String number)
-
-
-static java.util.logging.Logger
-getLogger (java.lang.Class<?> clazz,
- java.lang.String mainLoggerName)
-
-
-static java.lang.Integer
-intOrNull (java.lang.String number)
-
-
-static java.lang.Long
-longOrNull (java.lang.String number)
-
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-Summary:
-Nested |
-Field |
-Constr |
-Method
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/util/package-frame.html b/Lab5Core/build/docs/javadoc/common/util/package-frame.html
deleted file mode 100644
index c4db2dd..0000000
--- a/Lab5Core/build/docs/javadoc/common/util/package-frame.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-common.util (Lab5Core 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/util/package-summary.html b/Lab5Core/build/docs/javadoc/common/util/package-summary.html
deleted file mode 100644
index 12e03ef..0000000
--- a/Lab5Core/build/docs/javadoc/common/util/package-summary.html
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
-
-
-common.util (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-Class Summary
-
-Class
-Description
-
-
-
-UtilFunctions
-
-Класс функций-утилит для избавления от повторяющихся участков кода и выноса их в методы для общего пользования
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/common/util/package-tree.html b/Lab5Core/build/docs/javadoc/common/util/package-tree.html
deleted file mode 100644
index f8630f8..0000000
--- a/Lab5Core/build/docs/javadoc/common/util/package-tree.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-common.util Class Hierarchy (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/constant-values.html b/Lab5Core/build/docs/javadoc/constant-values.html
deleted file mode 100644
index f84e4b8..0000000
--- a/Lab5Core/build/docs/javadoc/constant-values.html
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-
-Constant Field Values (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/deprecated-list.html b/Lab5Core/build/docs/javadoc/deprecated-list.html
deleted file mode 100644
index 2de75b1..0000000
--- a/Lab5Core/build/docs/javadoc/deprecated-list.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-Deprecated List (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/help-doc.html b/Lab5Core/build/docs/javadoc/help-doc.html
deleted file mode 100644
index 77c9de4..0000000
--- a/Lab5Core/build/docs/javadoc/help-doc.html
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
-
-API Help (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-Overview
-The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.
-
-
-Package
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:
-
-Interfaces (italic)
-Classes
-Enums
-Exceptions
-Errors
-Annotation Types
-
-
-
-Class/Interface
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:
-
-Class inheritance diagram
-Direct Subclasses
-All Known Subinterfaces
-All Known Implementing Classes
-Class/interface declaration
-Class/interface description
-
-
-Nested Class Summary
-Field Summary
-Constructor Summary
-Method Summary
-
-
-Field Detail
-Constructor Detail
-Method Detail
-
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.
-
-
-Annotation Type
-Each annotation type has its own separate page with the following sections:
-
-Annotation Type declaration
-Annotation Type description
-Required Element Summary
-Optional Element Summary
-Element Detail
-
-
-
-Enum
-Each enum has its own separate page with the following sections:
-
-Enum declaration
-Enum description
-Enum Constant Summary
-Enum Constant Detail
-
-
-
-Tree (Class Hierarchy)
-There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object
. The interfaces do not inherit from java.lang.Object
.
-
-When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
-When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
-
-
-
-Deprecated API
-The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
-
-
-Index
-The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
-
-
-Prev/Next
-These links take you to the next or previous class, interface, package, or related page.
-
-
-Frames/No Frames
-These links show and hide the HTML frames. All pages are available with or without frames.
-
-
-All Classes
-The All Classes link shows all classes and interfaces except non-static nested types.
-
-
-Serialized Form
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-
-
-Constant Field Values
-The Constant Field Values page lists the static final fields and their values.
-
-
-
This help file applies to API documentation generated using the standard doclet.
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/index-all.html b/Lab5Core/build/docs/javadoc/index-all.html
deleted file mode 100644
index 987d938..0000000
--- a/Lab5Core/build/docs/javadoc/index-all.html
+++ /dev/null
@@ -1,691 +0,0 @@
-
-
-
-
-
-Index (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-A C D E F G H I L O P R S T U V
-
-
-
A
-
-AddCommand - Class in common.commandline.pdcommands
-
-AddCommand() - Constructor for class common.commandline.pdcommands.AddCommand
-
-AddCommand(String, String) - Constructor for class common.commandline.pdcommands.AddCommand
-
-AddIfMaxCommand - Class in common.commandline.pdcommands
-
-AddIfMaxCommand() - Constructor for class common.commandline.pdcommands.AddIfMaxCommand
-
-AddIfMinCommand - Class in common.commandline.pdcommands
-
-AddIfMinCommand() - Constructor for class common.commandline.pdcommands.AddIfMinCommand
-
-addNewInput(Reader, String) - Method in class common.commandline.CommandLineHandler
-
-alias - Variable in class common.commandline.Command
-
-allLowerFirstCapital(String) - Static method in class common.util.UtilFunctions
-
-appendObjects(Object[], Object...) - Static method in class common.util.UtilFunctions
-
-awaitInput(String) - Method in class common.commandline.CommandLineHandler
-
-awaitInput(String, String) - Method in class common.commandline.CommandLineHandler
-
-Метод, ожидающий ввода из потока ввода
reader
и возвращающий результат,
- печатает запрос msg перед ожиданием данных (если их вводит пользователь),
- печатает ошибку err, если при вводе данных произошла ошибка
-
-awaitInput(String, String, Predicate<String>) - Method in class common.commandline.CommandLineHandler
-
-Метод, ожидающий ввода из потока ввода
reader
и возвращающий результат,
- печатает запрос msg перед ожиданием данных (если их вводит пользователь),
- печатает ошибку err, если введенные данные не соответствуют предикату predicate
-
-awaitInput(String, String, Predicate<String>, Function<String, T>) - Method in class common.commandline.CommandLineHandler
-
-Метод, ожидающий ввода из потока ввода
reader
и возвращающий результат,
- печатает запрос msg перед ожиданием данных (если их вводит пользователь),
- печатает ошибку err, если введенные данные не соответствуют предикату predicate,
- преобразует результат в тип T в соответствии с функцией transform
-
-awaitPassword(String) - Method in class common.commandline.CommandLineHandler
-
-
-
-
-
-
C
-
-ClearCommand - Class in common.commandline.pdcommands
-
-ClearCommand() - Constructor for class common.commandline.pdcommands.ClearCommand
-
-clearScreen() - Static method in class common.commandline.CommandLineHandler
-
-clientOnly - Variable in class common.commandline.Command
-
-Color - Enum in common.data
-
-Перечисление цветов
-
-Command - Class in common.commandline
-
-Command(String, boolean, String) - Constructor for class common.commandline.Command
-
-CommandLineHandler - Class in common.commandline
-
-Класс обработчика командной строки, реализует шаблон проектирования Singleton,
- читает ввод с командной строки, обрабатывает его и вызывает соответствующую команду
- на выполнение из регистра команд, используйте метод
CommandLineHandler.start()
для его запуска
-
-CommandLineHandler() - Constructor for class common.commandline.CommandLineHandler
-
-CommandLineHandler.CommandLineNotInitialized - Exception in common.commandline
-
-CommandLineHandler.ExecuteScriptCommand - Class in common.commandline
-
-CommandLineHandler.ExitCommand - Class in common.commandline
-
-CommandLineHandler.HistoryCommand - Class in common.commandline
-
-CommandLineNotInitialized() - Constructor for exception common.commandline.CommandLineHandler.CommandLineNotInitialized
-
-CommandLineNotInitialized(String) - Constructor for exception common.commandline.CommandLineHandler.CommandLineNotInitialized
-
-CommandRegistry - Class in common.commandline
-
-Класс регистра команд, используемый для добавления, переопределения или удаления команд
-
-CommandRegistry.CommandAlreadyExistsException - Exception in common.commandline
-
-CommandRegistry.CommandNotFoundException - Exception in common.commandline
-
-CommandRegistry.HelpCommand - Class in common.commandline
-
-CommandResult - Class in common.commandline.response
-
-CommandResult(String, Response) - Constructor for class common.commandline.response.CommandResult
-
-common.collection - package common.collection
-
-common.commandline - package common.commandline
-
-common.commandline.commands - package common.commandline.commands
-
-common.commandline.pdcommands - package common.commandline.pdcommands
-
-common.commandline.response - package common.commandline.response
-
-common.data - package common.data
-
-common.net - package common.net
-
-common.util - package common.util
-
-compareTo(Coordinates) - Method in class common.data.Coordinates
-
-compareTo(Location) - Method in class common.data.Location
-
-Переопределенный метод сравнения двух местоположений,
- сравнение производится по имени локации и расстоянию до точки (0; 0; 0)
-
-compareTo(Person) - Method in class common.data.Person
-
-Переопределенный метод сравнения двух людей,
- сравнение производится по имени, номеру паспорта,
- росту, национальности, местоположению и цвету глаз
-
-ConnectionProperties - Class in common.net
-
-ConnectionProperties() - Constructor for class common.net.ConnectionProperties
-
-Coordinates - Class in common.data
-
-Класс данных координат
-
-Coordinates(float, float) - Constructor for class common.data.Coordinates
-
-Конструктор с параметрами
-
-Country - Enum in common.data
-
-Перечисление стран
-
-createCoordinates() - Static method in class common.commandline.pdcommands.PeopleDatabaseCommands
-
-createLocation() - Static method in class common.commandline.pdcommands.PeopleDatabaseCommands
-
-createPerson() - Static method in class common.commandline.pdcommands.PeopleDatabaseCommands
-
-
-
-
-
-
D
-
-DEFAULT_DB_HOST - Static variable in class common.net.ConnectionProperties
-
-DEFAULT_DB_NAME - Static variable in class common.net.ConnectionProperties
-
-DEFAULT_DB_PORT - Static variable in class common.net.ConnectionProperties
-
-DEFAULT_HOST - Static variable in class common.net.ConnectionProperties
-
-DEFAULT_PORT - Static variable in class common.net.ConnectionProperties
-
-DefaultResponse - Enum in common.commandline.response
-
-description - Variable in class common.commandline.Command
-
-doubleOrNull(String) - Static method in class common.util.UtilFunctions
-
-
-
-
-
-
E
-
-enumOrNull(String, Class<T>) - Static method in class common.util.UtilFunctions
-
-execute(Object[]) - Method in class common.commandline.Command
-
-execute(Object[]) - Method in class common.commandline.CommandLineHandler.ExecuteScriptCommand
-
-execute(Object[]) - Method in class common.commandline.CommandLineHandler.ExitCommand
-
-execute(Object[]) - Method in class common.commandline.CommandLineHandler.HistoryCommand
-
-execute(Object[]) - Method in class common.commandline.CommandRegistry.HelpCommand
-
-execute(Object[]) - Method in class common.commandline.commands.LogInCommand
-
-execute(Object[]) - Method in class common.commandline.commands.SignUpCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.AddCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.AddIfMaxCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.AddIfMinCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.ClearCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.FilterContainsNameCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.InfoCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.PrintFieldDescendingLocationCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.RemoveByIdCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.ShowCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.SumOfHeightCommand
-
-execute(Object[]) - Method in class common.commandline.pdcommands.UpdateCommand
-
-executeCommand(String, String[]) - Method in class common.commandline.CommandLineHandler
-
-ExecuteScriptCommand() - Constructor for class common.commandline.CommandLineHandler.ExecuteScriptCommand
-
-ExitCommand() - Constructor for class common.commandline.CommandLineHandler.ExitCommand
-
-
-
-
-
-
F
-
-FILE_NAME - Static variable in class common.net.ConnectionProperties
-
-fileNames - Variable in class common.commandline.CommandLineHandler
-
-FilterContainsNameCommand - Class in common.commandline.pdcommands
-
-FilterContainsNameCommand() - Constructor for class common.commandline.pdcommands.FilterContainsNameCommand
-
-floatOrNull(String) - Static method in class common.util.UtilFunctions
-
-formatted() - Method in class common.data.Person
-
-
-
-
-
-
G
-
-getCommand(String) - Static method in class common.commandline.CommandRegistry
-
-getDbURL() - Static method in class common.net.ConnectionProperties
-
-getExpectedClass() - Method in class common.commandline.PlaceHolder
-
-getHostname() - Static method in class common.net.ConnectionProperties
-
-getInstance() - Static method in class common.commandline.CommandLineHandler
-
-getLogger(Class<?>, String) - Static method in class common.util.UtilFunctions
-
-getMsg() - Method in enum common.commandline.response.DefaultResponse
-
-getMsg() - Method in enum common.commandline.response.PeopleDatabaseResponse
-
-getMsg() - Method in interface common.commandline.response.Response
-
-getMsg() - Method in enum common.commandline.response.SqlResponse
-
-getPort() - Static method in class common.net.ConnectionProperties
-
-getResponse() - Method in class common.commandline.response.CommandResult
-
-getValue() - Method in enum common.commandline.LongStrings
-
-getValue() - Method in class common.commandline.response.CommandResult
-
-
-
-
-
-
H
-
-HelpCommand() - Constructor for class common.commandline.CommandRegistry.HelpCommand
-
-history - Variable in class common.commandline.CommandLineHandler
-
-HistoryCommand() - Constructor for class common.commandline.CommandLineHandler.HistoryCommand
-
-
-
-
-
-
I
-
-info() - Method in class common.collection.PeopleCollection
-
-InfoCommand - Class in common.commandline.pdcommands
-
-InfoCommand() - Constructor for class common.commandline.pdcommands.InfoCommand
-
-initFromDatabase(String, String, String) - Method in class common.collection.PeopleCollection
-
-input() - Method in class common.commandline.CommandLineHandler
-
-inputs - Variable in class common.commandline.CommandLineHandler
-
-instance - Static variable in class common.commandline.CommandLineHandler
-
-intOrNull(String) - Static method in class common.util.UtilFunctions
-
-isActive - Variable in class common.commandline.CommandLineHandler
-
-isActive() - Method in class common.commandline.CommandLineHandler
-
-
-
-
-
-
L
-
-Location - Class in common.data
-
-Класс данных местоположения, реализует сортировку по умолчанию
- по имени и расстоянию до точки (0; 0; 0)
-
-Location(double, float, long, String) - Constructor for class common.data.Location
-
-Конструктор с параметрами
-
-logger - Static variable in class common.net.ConnectionProperties
-
-LogInCommand - Class in common.commandline.commands
-
-LogInCommand() - Constructor for class common.commandline.commands.LogInCommand
-
-longOrNull(String) - Static method in class common.util.UtilFunctions
-
-LongStrings - Enum in common.commandline
-
-
-
-
-
-
O
-
-of(Class<T>) - Static method in class common.commandline.PlaceHolder
-
-
-
-
-
-
P
-
-PeopleCollection - Class in common.collection
-
-PeopleCollection() - Constructor for class common.collection.PeopleCollection
-
-peopleCollection - Static variable in class common.commandline.pdcommands.PeopleDatabaseCommands
-
-PeopleDatabaseCommand - Class in common.commandline.pdcommands
-
-PeopleDatabaseCommand(String, boolean, String) - Constructor for class common.commandline.pdcommands.PeopleDatabaseCommand
-
-PeopleDatabaseCommands - Class in common.commandline.pdcommands
-
-Класс объявления всех команд, связанных с манипуляциями над объектом класса PeopleDatabase
-
-PeopleDatabaseResponse - Enum in common.commandline.response
-
-Person - Class in common.data
-
-Класс данных человека, реализует сортировку по умолчанию по имени, номеру паспорта,
- росту, национальности, местоположению и цвету глаз
-
-Person(long, String, Coordinates, Integer, String, Color, Country, Location, String) - Constructor for class common.data.Person
-
-Конструктор с параметрами
-
-Person(String, Coordinates, Integer, String, Color, Country, Location, String) - Constructor for class common.data.Person
-
-PlaceHolder <T > - Class in common.commandline
-
-PlaceHolder(Class<T>) - Constructor for class common.commandline.PlaceHolder
-
-PrintFieldDescendingLocationCommand - Class in common.commandline.pdcommands
-
-PrintFieldDescendingLocationCommand() - Constructor for class common.commandline.pdcommands.PrintFieldDescendingLocationCommand
-
-properties - Static variable in class common.net.ConnectionProperties
-
-
-
-
-
-
R
-
-reader - Variable in class common.commandline.CommandLineHandler
-
-reassignCommand(Command) - Static method in class common.commandline.CommandRegistry
-
-registerCommand(Command) - Static method in class common.commandline.CommandRegistry
-
-registerCommands(Command...) - Static method in class common.commandline.CommandRegistry
-
-RemoveByIdCommand - Class in common.commandline.pdcommands
-
-RemoveByIdCommand() - Constructor for class common.commandline.pdcommands.RemoveByIdCommand
-
-removeInput() - Method in class common.commandline.CommandLineHandler
-
-replacePlaceHoldersWith(Object[], Object...) - Static method in class common.commandline.PlaceHolder
-
-Response - Interface in common.commandline.response
-
-
-
-
-
-
S
-
-setHostname(String) - Static method in class common.net.ConnectionProperties
-
-setPort(int) - Static method in class common.net.ConnectionProperties
-
-ShowCommand - Class in common.commandline.pdcommands
-
-ShowCommand() - Constructor for class common.commandline.pdcommands.ShowCommand
-
-SignUpCommand - Class in common.commandline.commands
-
-SignUpCommand() - Constructor for class common.commandline.commands.SignUpCommand
-
-SqlResponse - Enum in common.commandline.response
-
-start() - Method in class common.commandline.CommandLineHandler
-
-Метод, запускающий обработчик командной строки, для остановки требуется ввести команду "exit"
-
-SumOfHeightCommand - Class in common.commandline.pdcommands
-
-SumOfHeightCommand() - Constructor for class common.commandline.pdcommands.SumOfHeightCommand
-
-
-
-
-
-
T
-
-toString() - Method in class common.collection.PeopleCollection
-
-
-
-
-
-
U
-
-unregisterCommand(String) - Static method in class common.commandline.CommandRegistry
-
-update(Person) - Method in class common.data.Person
-
-
-
-UpdateCommand - Class in common.commandline.pdcommands
-
-UpdateCommand() - Constructor for class common.commandline.pdcommands.UpdateCommand
-
-updateHistory(String) - Method in class common.commandline.CommandLineHandler
-
-UtilFunctions - Class in common.util
-
-Класс функций-утилит для избавления от повторяющихся участков кода и выноса их в методы для общего пользования
-
-
-
-
-
-
V
-
-validate(String[]) - Method in class common.commandline.Command
-
-validate(String[]) - Method in class common.commandline.CommandLineHandler.ExecuteScriptCommand
-
-validate(String[]) - Method in class common.commandline.CommandLineHandler.HistoryCommand
-
-validate(String[]) - Method in class common.commandline.commands.LogInCommand
-
-validate(String[]) - Method in class common.commandline.commands.SignUpCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.AddCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.AddIfMaxCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.AddIfMinCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.ClearCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.FilterContainsNameCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.InfoCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.PrintFieldDescendingLocationCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.RemoveByIdCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.ShowCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.SumOfHeightCommand
-
-validate(String[]) - Method in class common.commandline.pdcommands.UpdateCommand
-
-validateId(String[]) - Static method in class common.commandline.pdcommands.PeopleDatabaseCommand
-
-valueOf(String) - Static method in enum common.commandline.LongStrings
-
-Returns the enum constant of this type with the specified name.
-
-valueOf(String) - Static method in enum common.commandline.response.DefaultResponse
-
-Returns the enum constant of this type with the specified name.
-
-valueOf(String) - Static method in enum common.commandline.response.PeopleDatabaseResponse
-
-Returns the enum constant of this type with the specified name.
-
-valueOf(String) - Static method in enum common.commandline.response.SqlResponse
-
-Returns the enum constant of this type with the specified name.
-
-valueOf(String) - Static method in enum common.data.Color
-
-Returns the enum constant of this type with the specified name.
-
-valueOf(String) - Static method in enum common.data.Country
-
-Returns the enum constant of this type with the specified name.
-
-values() - Static method in enum common.commandline.LongStrings
-
-Returns an array containing the constants of this enum type, in
-the order they are declared.
-
-values() - Static method in enum common.commandline.response.DefaultResponse
-
-Returns an array containing the constants of this enum type, in
-the order they are declared.
-
-values() - Static method in enum common.commandline.response.PeopleDatabaseResponse
-
-Returns an array containing the constants of this enum type, in
-the order they are declared.
-
-values() - Static method in enum common.commandline.response.SqlResponse
-
-Returns an array containing the constants of this enum type, in
-the order they are declared.
-
-values() - Static method in enum common.data.Color
-
-Returns an array containing the constants of this enum type, in
-the order they are declared.
-
-values() - Static method in enum common.data.Country
-
-Returns an array containing the constants of this enum type, in
-the order they are declared.
-
-
-
A C D E F G H I L O P R S T U V
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/index.html b/Lab5Core/build/docs/javadoc/index.html
deleted file mode 100644
index afcf3b2..0000000
--- a/Lab5Core/build/docs/javadoc/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-Lab5Core 3.0 API
-
-
-
-
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-Frame Alert
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to Non-frame version .
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/overview-frame.html b/Lab5Core/build/docs/javadoc/overview-frame.html
deleted file mode 100644
index f4183a2..0000000
--- a/Lab5Core/build/docs/javadoc/overview-frame.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-Overview List (Lab5Core 3.0 API)
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/overview-summary.html b/Lab5Core/build/docs/javadoc/overview-summary.html
deleted file mode 100644
index 2a5e81c..0000000
--- a/Lab5Core/build/docs/javadoc/overview-summary.html
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
-
-Overview (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/overview-tree.html b/Lab5Core/build/docs/javadoc/overview-tree.html
deleted file mode 100644
index 253ec2a..0000000
--- a/Lab5Core/build/docs/javadoc/overview-tree.html
+++ /dev/null
@@ -1,216 +0,0 @@
-
-
-
-
-
-Class Hierarchy (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
Class Hierarchy
-
-java.lang.Object
-
-common.commandline.Command (implements java.io.Serializable)
-
-
-common.commandline.CommandLineHandler
-common.commandline.CommandRegistry
-common.commandline.response.CommandResult (implements java.io.Serializable)
-common.net.ConnectionProperties
-common.data.Coordinates (implements java.lang.Comparable<T>, java.io.Serializable)
-common.data.Location (implements java.lang.Comparable<T>, java.io.Serializable)
-common.collection.PeopleCollection
-common.commandline.pdcommands.PeopleDatabaseCommands
-common.data.Person (implements java.lang.Comparable<T>, java.io.Serializable)
-common.commandline.PlaceHolder <T> (implements java.io.Serializable)
-java.lang.Throwable (implements java.io.Serializable)
-
-java.lang.Exception
-
-java.lang.RuntimeException
-
-
-
-
-
-
-common.util.UtilFunctions
-
-
-
-
Interface Hierarchy
-
-java.io.Serializable
-
-
-
-
Enum Hierarchy
-
-java.lang.Object
-
-java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/package-list b/Lab5Core/build/docs/javadoc/package-list
deleted file mode 100644
index 8a6a091..0000000
--- a/Lab5Core/build/docs/javadoc/package-list
+++ /dev/null
@@ -1,8 +0,0 @@
-common.collection
-common.commandline
-common.commandline.commands
-common.commandline.pdcommands
-common.commandline.response
-common.data
-common.net
-common.util
diff --git a/Lab5Core/build/docs/javadoc/script.js b/Lab5Core/build/docs/javadoc/script.js
deleted file mode 100644
index b346356..0000000
--- a/Lab5Core/build/docs/javadoc/script.js
+++ /dev/null
@@ -1,30 +0,0 @@
-function show(type)
-{
- count = 0;
- for (var key in methods) {
- var row = document.getElementById(key);
- if ((methods[key] & type) != 0) {
- row.style.display = '';
- row.className = (count++ % 2) ? rowColor : altColor;
- }
- else
- row.style.display = 'none';
- }
- updateTabs(type);
-}
-
-function updateTabs(type)
-{
- for (var value in tabs) {
- var sNode = document.getElementById(tabs[value][0]);
- var spanNode = sNode.firstChild;
- if (value == type) {
- sNode.className = activeTableTab;
- spanNode.innerHTML = tabs[value][1];
- }
- else {
- sNode.className = tableTab;
- spanNode.innerHTML = "" + tabs[value][1] + " ";
- }
- }
-}
diff --git a/Lab5Core/build/docs/javadoc/serialized-form.html b/Lab5Core/build/docs/javadoc/serialized-form.html
deleted file mode 100644
index 631a3c5..0000000
--- a/Lab5Core/build/docs/javadoc/serialized-form.html
+++ /dev/null
@@ -1,430 +0,0 @@
-
-
-
-
-
-Serialized Form (Lab5Core 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Core/build/docs/javadoc/stylesheet.css b/Lab5Core/build/docs/javadoc/stylesheet.css
deleted file mode 100644
index 98055b2..0000000
--- a/Lab5Core/build/docs/javadoc/stylesheet.css
+++ /dev/null
@@ -1,574 +0,0 @@
-/* Javadoc style sheet */
-/*
-Overall document style
-*/
-
-@import url('resources/fonts/dejavu.css');
-
-body {
- background-color:#ffffff;
- color:#353833;
- font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
- font-size:14px;
- margin:0;
-}
-a:link, a:visited {
- text-decoration:none;
- color:#4A6782;
-}
-a:hover, a:focus {
- text-decoration:none;
- color:#bb7a2a;
-}
-a:active {
- text-decoration:none;
- color:#4A6782;
-}
-a[name] {
- color:#353833;
-}
-a[name]:hover {
- text-decoration:none;
- color:#353833;
-}
-pre {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
-}
-h1 {
- font-size:20px;
-}
-h2 {
- font-size:18px;
-}
-h3 {
- font-size:16px;
- font-style:italic;
-}
-h4 {
- font-size:13px;
-}
-h5 {
- font-size:12px;
-}
-h6 {
- font-size:11px;
-}
-ul {
- list-style-type:disc;
-}
-code, tt {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- padding-top:4px;
- margin-top:8px;
- line-height:1.4em;
-}
-dt code {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- padding-top:4px;
-}
-table tr td dt code {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- vertical-align:top;
- padding-top:4px;
-}
-sup {
- font-size:8px;
-}
-/*
-Document title and Copyright styles
-*/
-.clear {
- clear:both;
- height:0px;
- overflow:hidden;
-}
-.aboutLanguage {
- float:right;
- padding:0px 21px;
- font-size:11px;
- z-index:200;
- margin-top:-9px;
-}
-.legalCopy {
- margin-left:.5em;
-}
-.bar a, .bar a:link, .bar a:visited, .bar a:active {
- color:#FFFFFF;
- text-decoration:none;
-}
-.bar a:hover, .bar a:focus {
- color:#bb7a2a;
-}
-.tab {
- background-color:#0066FF;
- color:#ffffff;
- padding:8px;
- width:5em;
- font-weight:bold;
-}
-/*
-Navigation bar styles
-*/
-.bar {
- background-color:#4D7A97;
- color:#FFFFFF;
- padding:.8em .5em .4em .8em;
- height:auto;/*height:1.8em;*/
- font-size:11px;
- margin:0;
-}
-.topNav {
- background-color:#4D7A97;
- color:#FFFFFF;
- float:left;
- padding:0;
- width:100%;
- clear:right;
- height:2.8em;
- padding-top:10px;
- overflow:hidden;
- font-size:12px;
-}
-.bottomNav {
- margin-top:10px;
- background-color:#4D7A97;
- color:#FFFFFF;
- float:left;
- padding:0;
- width:100%;
- clear:right;
- height:2.8em;
- padding-top:10px;
- overflow:hidden;
- font-size:12px;
-}
-.subNav {
- background-color:#dee3e9;
- float:left;
- width:100%;
- overflow:hidden;
- font-size:12px;
-}
-.subNav div {
- clear:left;
- float:left;
- padding:0 0 5px 6px;
- text-transform:uppercase;
-}
-ul.navList, ul.subNavList {
- float:left;
- margin:0 25px 0 0;
- padding:0;
-}
-ul.navList li{
- list-style:none;
- float:left;
- padding: 5px 6px;
- text-transform:uppercase;
-}
-ul.subNavList li{
- list-style:none;
- float:left;
-}
-.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
- color:#FFFFFF;
- text-decoration:none;
- text-transform:uppercase;
-}
-.topNav a:hover, .bottomNav a:hover {
- text-decoration:none;
- color:#bb7a2a;
- text-transform:uppercase;
-}
-.navBarCell1Rev {
- background-color:#F8981D;
- color:#253441;
- margin: auto 5px;
-}
-.skipNav {
- position:absolute;
- top:auto;
- left:-9999px;
- overflow:hidden;
-}
-/*
-Page header and footer styles
-*/
-.header, .footer {
- clear:both;
- margin:0 20px;
- padding:5px 0 0 0;
-}
-.indexHeader {
- margin:10px;
- position:relative;
-}
-.indexHeader span{
- margin-right:15px;
-}
-.indexHeader h1 {
- font-size:13px;
-}
-.title {
- color:#2c4557;
- margin:10px 0;
-}
-.subTitle {
- margin:5px 0 0 0;
-}
-.header ul {
- margin:0 0 15px 0;
- padding:0;
-}
-.footer ul {
- margin:20px 0 5px 0;
-}
-.header ul li, .footer ul li {
- list-style:none;
- font-size:13px;
-}
-/*
-Heading styles
-*/
-div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
- background-color:#dee3e9;
- border:1px solid #d0d9e0;
- margin:0 0 6px -8px;
- padding:7px 5px;
-}
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
- background-color:#dee3e9;
- border:1px solid #d0d9e0;
- margin:0 0 6px -8px;
- padding:7px 5px;
-}
-ul.blockList ul.blockList li.blockList h3 {
- padding:0;
- margin:15px 0;
-}
-ul.blockList li.blockList h2 {
- padding:0px 0 20px 0;
-}
-/*
-Page layout container styles
-*/
-.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
- clear:both;
- padding:10px 20px;
- position:relative;
-}
-.indexContainer {
- margin:10px;
- position:relative;
- font-size:12px;
-}
-.indexContainer h2 {
- font-size:13px;
- padding:0 0 3px 0;
-}
-.indexContainer ul {
- margin:0;
- padding:0;
-}
-.indexContainer ul li {
- list-style:none;
- padding-top:2px;
-}
-.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
- font-size:12px;
- font-weight:bold;
- margin:10px 0 0 0;
- color:#4E4E4E;
-}
-.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
- margin:5px 0 10px 0px;
- font-size:14px;
- font-family:'DejaVu Sans Mono',monospace;
-}
-.serializedFormContainer dl.nameValue dt {
- margin-left:1px;
- font-size:1.1em;
- display:inline;
- font-weight:bold;
-}
-.serializedFormContainer dl.nameValue dd {
- margin:0 0 0 1px;
- font-size:1.1em;
- display:inline;
-}
-/*
-List styles
-*/
-ul.horizontal li {
- display:inline;
- font-size:0.9em;
-}
-ul.inheritance {
- margin:0;
- padding:0;
-}
-ul.inheritance li {
- display:inline;
- list-style:none;
-}
-ul.inheritance li ul.inheritance {
- margin-left:15px;
- padding-left:15px;
- padding-top:1px;
-}
-ul.blockList, ul.blockListLast {
- margin:10px 0 10px 0;
- padding:0;
-}
-ul.blockList li.blockList, ul.blockListLast li.blockList {
- list-style:none;
- margin-bottom:15px;
- line-height:1.4;
-}
-ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
- padding:0px 20px 5px 10px;
- border:1px solid #ededed;
- background-color:#f8f8f8;
-}
-ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
- padding:0 0 5px 8px;
- background-color:#ffffff;
- border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
- margin-left:0;
- padding-left:0;
- padding-bottom:15px;
- border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
- list-style:none;
- border-bottom:none;
- padding-bottom:0;
-}
-table tr td dl, table tr td dl dt, table tr td dl dd {
- margin-top:0;
- margin-bottom:1px;
-}
-/*
-Table styles
-*/
-.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
- width:100%;
- border-left:1px solid #EEE;
- border-right:1px solid #EEE;
- border-bottom:1px solid #EEE;
-}
-.overviewSummary, .memberSummary {
- padding:0px;
-}
-.overviewSummary caption, .memberSummary caption, .typeSummary caption,
-.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
- position:relative;
- text-align:left;
- background-repeat:no-repeat;
- color:#253441;
- font-weight:bold;
- clear:none;
- overflow:hidden;
- padding:0px;
- padding-top:10px;
- padding-left:1px;
- margin:0px;
- white-space:pre;
-}
-.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
-.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
-.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
-.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
-.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
-.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
-.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
-.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
- color:#FFFFFF;
-}
-.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- padding-bottom:7px;
- display:inline-block;
- float:left;
- background-color:#F8981D;
- border: none;
- height:16px;
-}
-.memberSummary caption span.activeTableTab span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- margin-right:3px;
- display:inline-block;
- float:left;
- background-color:#F8981D;
- height:16px;
-}
-.memberSummary caption span.tableTab span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- margin-right:3px;
- display:inline-block;
- float:left;
- background-color:#4D7A97;
- height:16px;
-}
-.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
- padding-top:0px;
- padding-left:0px;
- padding-right:0px;
- background-image:none;
- float:none;
- display:inline;
-}
-.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
- display:none;
- width:5px;
- position:relative;
- float:left;
- background-color:#F8981D;
-}
-.memberSummary .activeTableTab .tabEnd {
- display:none;
- width:5px;
- margin-right:3px;
- position:relative;
- float:left;
- background-color:#F8981D;
-}
-.memberSummary .tableTab .tabEnd {
- display:none;
- width:5px;
- margin-right:3px;
- position:relative;
- background-color:#4D7A97;
- float:left;
-
-}
-.overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td {
- text-align:left;
- padding:0px 0px 12px 10px;
-}
-th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
-td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
- vertical-align:top;
- padding-right:0px;
- padding-top:8px;
- padding-bottom:3px;
-}
-th.colFirst, th.colLast, th.colOne, .constantsSummary th {
- background:#dee3e9;
- text-align:left;
- padding:8px 3px 3px 7px;
-}
-td.colFirst, th.colFirst {
- white-space:nowrap;
- font-size:13px;
-}
-td.colLast, th.colLast {
- font-size:13px;
-}
-td.colOne, th.colOne {
- font-size:13px;
-}
-.overviewSummary td.colFirst, .overviewSummary th.colFirst,
-.useSummary td.colFirst, .useSummary th.colFirst,
-.overviewSummary td.colOne, .overviewSummary th.colOne,
-.memberSummary td.colFirst, .memberSummary th.colFirst,
-.memberSummary td.colOne, .memberSummary th.colOne,
-.typeSummary td.colFirst{
- width:25%;
- vertical-align:top;
-}
-td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
- font-weight:bold;
-}
-.tableSubHeadingColor {
- background-color:#EEEEFF;
-}
-.altColor {
- background-color:#FFFFFF;
-}
-.rowColor {
- background-color:#EEEEEF;
-}
-/*
-Content styles
-*/
-.description pre {
- margin-top:0;
-}
-.deprecatedContent {
- margin:0;
- padding:10px 0;
-}
-.docSummary {
- padding:0;
-}
-
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
- font-style:normal;
-}
-
-div.block {
- font-size:14px;
- font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-
-td.colLast div {
- padding-top:0px;
-}
-
-
-td.colLast a {
- padding-bottom:3px;
-}
-/*
-Formatting effect styles
-*/
-.sourceLineNo {
- color:green;
- padding:0 30px 0 0;
-}
-h1.hidden {
- visibility:hidden;
- overflow:hidden;
- font-size:10px;
-}
-.block {
- display:block;
- margin:3px 10px 2px 0px;
- color:#474747;
-}
-.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
-.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
-.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
- font-weight:bold;
-}
-.deprecationComment, .emphasizedPhrase, .interfaceName {
- font-style:italic;
-}
-
-div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
-div.block div.block span.interfaceName {
- font-style:normal;
-}
-
-div.contentContainer ul.blockList li.blockList h2{
- padding-bottom:0px;
-}
diff --git a/Lab5Core/build/libs/Lab5Core-2.0.jar b/Lab5Core/build/libs/Lab5Core-2.0.jar
deleted file mode 100644
index b00027e..0000000
Binary files a/Lab5Core/build/libs/Lab5Core-2.0.jar and /dev/null differ
diff --git a/Lab5Core/build/libs/Lab5Core-2.1.jar b/Lab5Core/build/libs/Lab5Core-2.1.jar
deleted file mode 100644
index cff4af1..0000000
Binary files a/Lab5Core/build/libs/Lab5Core-2.1.jar and /dev/null differ
diff --git a/Lab5Core/build/libs/Lab5Core-2.2.jar b/Lab5Core/build/libs/Lab5Core-2.2.jar
deleted file mode 100644
index f221b06..0000000
Binary files a/Lab5Core/build/libs/Lab5Core-2.2.jar and /dev/null differ
diff --git a/Lab5Core/build/libs/Lab5Core-3.0.jar b/Lab5Core/build/libs/Lab5Core-3.0.jar
deleted file mode 100644
index 0decdb3..0000000
Binary files a/Lab5Core/build/libs/Lab5Core-3.0.jar and /dev/null differ
diff --git a/Lab5Core/build/resources/main/connection.properties b/Lab5Core/build/resources/main/connection.properties
deleted file mode 100644
index a1e7224..0000000
--- a/Lab5Core/build/resources/main/connection.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-hostname=localhost
-port=1234
diff --git a/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin
deleted file mode 100644
index 776361d..0000000
Binary files a/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ
diff --git a/Lab5Core/build/tmp/jar/MANIFEST.MF b/Lab5Core/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index 59499bc..0000000
--- a/Lab5Core/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/Lab5Core/build/tmp/javadoc/javadoc.options b/Lab5Core/build/tmp/javadoc/javadoc.options
deleted file mode 100644
index 559023d..0000000
--- a/Lab5Core/build/tmp/javadoc/javadoc.options
+++ /dev/null
@@ -1,40 +0,0 @@
--classpath 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\classes\\java\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\resources\\main;C:\\Users\\egor\\.gradle\\caches\\modules-2\\files-2.1\\org.projectlombok\\lombok\\1.18.24\\13a394eed5c4f9efb2a6d956e2086f1d81e857d9\\lombok-1.18.24.jar'
--d 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\docs\\javadoc'
--doctitle 'Lab5Core 3.0 API'
--encoding 'UTF-8'
--notimestamp
--quiet
--windowtitle 'Lab5Core 3.0 API'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\collection\\PeopleCollection.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\Command.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\CommandLineHandler.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\CommandRegistry.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\commands\\LogInCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\commands\\SignUpCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\LongStrings.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\AddCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\AddIfMaxCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\AddIfMinCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\ClearCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\FilterContainsNameCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\InfoCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\PeopleDatabaseCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\PeopleDatabaseCommands.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\PrintFieldDescendingLocationCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\RemoveByIdCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\ShowCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\SumOfHeightCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\pdcommands\\UpdateCommand.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\PlaceHolder.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\CommandResult.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\DefaultResponse.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\PeopleDatabaseResponse.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\Response.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\commandline\\response\\SqlResponse.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\data\\Color.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\data\\Coordinates.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\data\\Country.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\data\\Location.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\data\\Person.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\net\\ConnectionProperties.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\util\\UtilFunctions.java'
diff --git a/Lab5Core/src/main/java/common/collection/PeopleCollection.java b/Lab5Core/src/main/java/common/collection/PeopleCollection.java
index e3c19e7..ea5fb8f 100644
--- a/Lab5Core/src/main/java/common/collection/PeopleCollection.java
+++ b/Lab5Core/src/main/java/common/collection/PeopleCollection.java
@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
public class PeopleCollection {
- private final static String TYPE = "TreeSet";
+ private final static String TYPE = "SyncTreeSet";
@Getter
private final NavigableSet collection = Collections.synchronizedNavigableSet(new TreeSet<>());
diff --git a/Lab5Core/src/main/java/common/commandline/commands/EmulateWork.java b/Lab5Core/src/main/java/common/commandline/commands/EmulateWork.java
new file mode 100644
index 0000000..b6844a8
--- /dev/null
+++ b/Lab5Core/src/main/java/common/commandline/commands/EmulateWork.java
@@ -0,0 +1,22 @@
+package common.commandline.commands;
+
+import common.commandline.Command;
+import common.commandline.response.CommandResult;
+import common.commandline.response.DefaultResponse;
+import common.commandline.response.Response;
+
+public class EmulateWork extends Command {
+
+ public EmulateWork() {
+ super("emulate", false, "");
+ }
+
+ @Override
+ public CommandResult execute(Object[] args) {
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException ignored) {}
+ Response response = DefaultResponse.OK;
+ return new CommandResult(response.getMsg(), response);
+ }
+}
diff --git a/Lab5Core/src/main/java/common/commandline/commands/LogInCommand.java b/Lab5Core/src/main/java/common/commandline/commands/LogInCommand.java
index 7f7938c..1fe8ccc 100644
--- a/Lab5Core/src/main/java/common/commandline/commands/LogInCommand.java
+++ b/Lab5Core/src/main/java/common/commandline/commands/LogInCommand.java
@@ -39,9 +39,15 @@ public class LogInCommand extends Command {
result.next();
boolean authorize = result.getInt(1) > 0;
response = authorize ? SqlResponse.OK : SqlResponse.WRONG_CREDENTIALS;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ response = SqlResponse.UNKNOWN;
+ }
+ try {
connection.commit();
} catch (SQLException e) {
e.printStackTrace();
+ System.err.println("Не удалось сохранить изменения в базе данных");
response = SqlResponse.UNKNOWN;
}
return new CommandResult(response.getMsg(), response);
diff --git a/Lab5Core/src/main/java/common/commandline/commands/SignUpCommand.java b/Lab5Core/src/main/java/common/commandline/commands/SignUpCommand.java
index ef095b3..97d915b 100644
--- a/Lab5Core/src/main/java/common/commandline/commands/SignUpCommand.java
+++ b/Lab5Core/src/main/java/common/commandline/commands/SignUpCommand.java
@@ -36,13 +36,18 @@ public class SignUpCommand extends Command {
statement.setString(2, password);
statement.executeUpdate();
response = SqlResponse.OK;
- connection.commit();
} catch (SQLException e) {
String state = e.getSQLState();
- e.printStackTrace();
if (state.equals("23505")) response = SqlResponse.LOGIN_EXISTS;
else response = SqlResponse.UNKNOWN;
}
+ try {
+ connection.commit();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ System.err.println("Не удалось сохранить изменения в базе данных");
+ response = SqlResponse.UNKNOWN;
+ }
return new CommandResult(response.getMsg(), response);
}
}
diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/AddCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/AddCommand.java
index 7288100..a2f4b32 100644
--- a/Lab5Core/src/main/java/common/commandline/pdcommands/AddCommand.java
+++ b/Lab5Core/src/main/java/common/commandline/pdcommands/AddCommand.java
@@ -55,7 +55,6 @@ public class AddCommand extends PeopleDatabaseCommand {
ResultSet result = statement.executeQuery();
result.next();
id = result.getLong(1);
- connection.commit();
} catch (SQLException e) {
e.printStackTrace();
Response response = SqlResponse.UNKNOWN;
@@ -65,6 +64,14 @@ public class AddCommand extends PeopleDatabaseCommand {
Response response = SqlResponse.NOT_FOUND;
return new CommandResult(response.getMsg(), response);
}
+ try {
+ connection.commit();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ System.err.println("Не удалось сохранить изменения в базе данных");
+ Response response = SqlResponse.UNKNOWN;
+ return new CommandResult(response.getMsg(), response);
+ }
person.setId(id);
peopleCollection.getCollection().add(person);
Response response = DefaultResponse.OK;
diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/ClearCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/ClearCommand.java
index 544dafa..b7a9edb 100644
--- a/Lab5Core/src/main/java/common/commandline/pdcommands/ClearCommand.java
+++ b/Lab5Core/src/main/java/common/commandline/pdcommands/ClearCommand.java
@@ -35,9 +35,16 @@ public class ClearCommand extends PeopleDatabaseCommand {
);
statement.setString(1, owner);
statement.executeUpdate();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ Response response = SqlResponse.UNKNOWN;
+ return new CommandResult(response.getMsg(), response);
+ }
+ try {
connection.commit();
} catch (SQLException e) {
e.printStackTrace();
+ System.err.println("Не удалось сохранить изменения в базе данных");
Response response = SqlResponse.UNKNOWN;
return new CommandResult(response.getMsg(), response);
}
diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/RemoveByIdCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/RemoveByIdCommand.java
index e7694f9..28c0e3a 100644
--- a/Lab5Core/src/main/java/common/commandline/pdcommands/RemoveByIdCommand.java
+++ b/Lab5Core/src/main/java/common/commandline/pdcommands/RemoveByIdCommand.java
@@ -34,15 +34,22 @@ public class RemoveByIdCommand extends PeopleDatabaseCommand {
try {
PreparedStatement statement = connection.prepareStatement(
"DELETE FROM people USING users " +
- "WHERE users.id = owner_id AND people.id = ? AND (login = ? OR is_admin);"
+ "WHERE users.id = owner_id AND people.id = ? AND login = ?;"
);
statement.setLong(1, id);
statement.setString(2, owner);
int result = statement.executeUpdate();
response = result > 0 ? SqlResponse.OK : SqlResponse.NOT_FOUND;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ response = SqlResponse.UNKNOWN;
+ return new CommandResult(response.getMsg(), response);
+ }
+ try {
connection.commit();
} catch (SQLException e) {
e.printStackTrace();
+ System.err.println("Не удалось сохранить изменения в базе данных");
response = SqlResponse.UNKNOWN;
return new CommandResult(response.getMsg(), response);
}
diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/UpdateCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/UpdateCommand.java
index acaa7c8..af0b8d3 100644
--- a/Lab5Core/src/main/java/common/commandline/pdcommands/UpdateCommand.java
+++ b/Lab5Core/src/main/java/common/commandline/pdcommands/UpdateCommand.java
@@ -59,9 +59,16 @@ public class UpdateCommand extends PeopleDatabaseCommand {
result.next();
success = result.getBoolean(1);
response = SqlResponse.OK;
+ } catch (SQLException e) {
+ e.printStackTrace();
+ response = SqlResponse.UNKNOWN;
+ return new CommandResult(response.getMsg(), response);
+ }
+ try {
connection.commit();
} catch (SQLException e) {
e.printStackTrace();
+ System.err.println("Не удалось сохранить изменения в базе данных");
response = SqlResponse.UNKNOWN;
return new CommandResult(response.getMsg(), response);
}
diff --git a/Lab5Core/src/main/java/common/util/UtilFunctions.java b/Lab5Core/src/main/java/common/util/UtilFunctions.java
index 1506e21..2c991c9 100644
--- a/Lab5Core/src/main/java/common/util/UtilFunctions.java
+++ b/Lab5Core/src/main/java/common/util/UtilFunctions.java
@@ -97,4 +97,11 @@ public final class UtilFunctions {
});
mainLogger.addHandler(handler);
}
+
+ public static Thread startNewThread(Runnable r, boolean isDaemon) {
+ Thread thread = new Thread(r);
+ thread.setDaemon(isDaemon);
+ thread.start();
+ return thread;
+ }
}
diff --git a/Lab5Server/.gitignore b/Lab5Server/.gitignore
new file mode 100644
index 0000000..8a0a60d
--- /dev/null
+++ b/Lab5Server/.gitignore
@@ -0,0 +1,4 @@
+# Project exclude paths
+/.gradle/
+/build/
+/build/classes/java/main/
\ No newline at end of file
diff --git a/Lab5Server/build/classes/java/main/server/Lab5Server.class b/Lab5Server/build/classes/java/main/server/Lab5Server.class
deleted file mode 100644
index 39d8d95..0000000
Binary files a/Lab5Server/build/classes/java/main/server/Lab5Server.class and /dev/null differ
diff --git a/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class b/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class
deleted file mode 100644
index 534ac4e..0000000
Binary files a/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class and /dev/null differ
diff --git a/Lab5Server/build/classes/java/main/server/net/UDPServer.class b/Lab5Server/build/classes/java/main/server/net/UDPServer.class
deleted file mode 100644
index f75086d..0000000
Binary files a/Lab5Server/build/classes/java/main/server/net/UDPServer.class and /dev/null differ
diff --git a/Lab5Server/build/docs/javadoc/allclasses-frame.html b/Lab5Server/build/docs/javadoc/allclasses-frame.html
deleted file mode 100644
index 6ee3d18..0000000
--- a/Lab5Server/build/docs/javadoc/allclasses-frame.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-All Classes (Lab5Server 3.0 API)
-
-
-
-
-All Classes
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/allclasses-noframe.html b/Lab5Server/build/docs/javadoc/allclasses-noframe.html
deleted file mode 100644
index c5e361a..0000000
--- a/Lab5Server/build/docs/javadoc/allclasses-noframe.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-All Classes (Lab5Server 3.0 API)
-
-
-
-
-All Classes
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/constant-values.html b/Lab5Server/build/docs/javadoc/constant-values.html
deleted file mode 100644
index fca7af3..0000000
--- a/Lab5Server/build/docs/javadoc/constant-values.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-Constant Field Values (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/deprecated-list.html b/Lab5Server/build/docs/javadoc/deprecated-list.html
deleted file mode 100644
index 25a9011..0000000
--- a/Lab5Server/build/docs/javadoc/deprecated-list.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
-
-
-Deprecated List (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/help-doc.html b/Lab5Server/build/docs/javadoc/help-doc.html
deleted file mode 100644
index 1214bf5..0000000
--- a/Lab5Server/build/docs/javadoc/help-doc.html
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
-
-API Help (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-Overview
-The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.
-
-
-Package
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:
-
-Interfaces (italic)
-Classes
-Enums
-Exceptions
-Errors
-Annotation Types
-
-
-
-Class/Interface
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:
-
-Class inheritance diagram
-Direct Subclasses
-All Known Subinterfaces
-All Known Implementing Classes
-Class/interface declaration
-Class/interface description
-
-
-Nested Class Summary
-Field Summary
-Constructor Summary
-Method Summary
-
-
-Field Detail
-Constructor Detail
-Method Detail
-
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.
-
-
-Annotation Type
-Each annotation type has its own separate page with the following sections:
-
-Annotation Type declaration
-Annotation Type description
-Required Element Summary
-Optional Element Summary
-Element Detail
-
-
-
-Enum
-Each enum has its own separate page with the following sections:
-
-Enum declaration
-Enum description
-Enum Constant Summary
-Enum Constant Detail
-
-
-
-Tree (Class Hierarchy)
-There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with java.lang.Object
. The interfaces do not inherit from java.lang.Object
.
-
-When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
-When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
-
-
-
-Deprecated API
-The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
-
-
-Index
-The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
-
-
-Prev/Next
-These links take you to the next or previous class, interface, package, or related page.
-
-
-Frames/No Frames
-These links show and hide the HTML frames. All pages are available with or without frames.
-
-
-All Classes
-The All Classes link shows all classes and interfaces except non-static nested types.
-
-
-Serialized Form
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-
-
-Constant Field Values
-The Constant Field Values page lists the static final fields and their values.
-
-
-
This help file applies to API documentation generated using the standard doclet.
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/index-all.html b/Lab5Server/build/docs/javadoc/index-all.html
deleted file mode 100644
index 924c97b..0000000
--- a/Lab5Server/build/docs/javadoc/index-all.html
+++ /dev/null
@@ -1,206 +0,0 @@
-
-
-
-
-
-Index (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-C D E G L M R S U
-
-
-
C
-
-CommandLineHandlerServer - Class in server.commandline
-
-connect() - Method in class server.net.UDPServer
-
-
-
-
-
-
D
-
-disconnect() - Method in class server.net.UDPServer
-
-
-
-
-
-
E
-
-executeCommand(String, String[]) - Method in class server.commandline.CommandLineHandlerServer
-
-
-
-
-
-
G
-
-getServerCommandLine() - Static method in class server.commandline.CommandLineHandlerServer
-
-
-
-
-
-
L
-
-Lab5Server - Class in server
-
-Lab5Server() - Constructor for class server.Lab5Server
-
-loadFromDatabase() - Method in class server.net.UDPServer
-
-LOGGER - Static variable in class server.Lab5Server
-
-
-
-
-
-
M
-
-main(String[]) - Static method in class server.Lab5Server
-
-
-
-
-
-
R
-
-receive() - Method in class server.net.UDPServer
-
-
-
-
-
-
S
-
-send(CommandResult, InetAddress, int) - Method in class server.net.UDPServer
-
-server - package server
-
-server.commandline - package server.commandline
-
-server.net - package server.net
-
-
-
-
-
-
U
-
-UDPServer - Class in server.net
-
-UDPServer(int, Logger) - Constructor for class server.net.UDPServer
-
-
-
C D E G L M R S U
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/index.html b/Lab5Server/build/docs/javadoc/index.html
deleted file mode 100644
index 1e5af00..0000000
--- a/Lab5Server/build/docs/javadoc/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-Lab5Server 3.0 API
-
-
-
-
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-Frame Alert
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to Non-frame version .
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/overview-frame.html b/Lab5Server/build/docs/javadoc/overview-frame.html
deleted file mode 100644
index 078110d..0000000
--- a/Lab5Server/build/docs/javadoc/overview-frame.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-Overview List (Lab5Server 3.0 API)
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/overview-summary.html b/Lab5Server/build/docs/javadoc/overview-summary.html
deleted file mode 100644
index 9bb1a00..0000000
--- a/Lab5Server/build/docs/javadoc/overview-summary.html
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
-
-
-Overview (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/overview-tree.html b/Lab5Server/build/docs/javadoc/overview-tree.html
deleted file mode 100644
index 60cdc51..0000000
--- a/Lab5Server/build/docs/javadoc/overview-tree.html
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
-
-Class Hierarchy (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/package-list b/Lab5Server/build/docs/javadoc/package-list
deleted file mode 100644
index 9d85908..0000000
--- a/Lab5Server/build/docs/javadoc/package-list
+++ /dev/null
@@ -1,3 +0,0 @@
-server
-server.commandline
-server.net
diff --git a/Lab5Server/build/docs/javadoc/script.js b/Lab5Server/build/docs/javadoc/script.js
deleted file mode 100644
index b346356..0000000
--- a/Lab5Server/build/docs/javadoc/script.js
+++ /dev/null
@@ -1,30 +0,0 @@
-function show(type)
-{
- count = 0;
- for (var key in methods) {
- var row = document.getElementById(key);
- if ((methods[key] & type) != 0) {
- row.style.display = '';
- row.className = (count++ % 2) ? rowColor : altColor;
- }
- else
- row.style.display = 'none';
- }
- updateTabs(type);
-}
-
-function updateTabs(type)
-{
- for (var value in tabs) {
- var sNode = document.getElementById(tabs[value][0]);
- var spanNode = sNode.firstChild;
- if (value == type) {
- sNode.className = activeTableTab;
- spanNode.innerHTML = tabs[value][1];
- }
- else {
- sNode.className = tableTab;
- spanNode.innerHTML = "" + tabs[value][1] + " ";
- }
- }
-}
diff --git a/Lab5Server/build/docs/javadoc/server/Lab5Server.html b/Lab5Server/build/docs/javadoc/server/Lab5Server.html
deleted file mode 100644
index bfe38e4..0000000
--- a/Lab5Server/build/docs/javadoc/server/Lab5Server.html
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
-Lab5Server (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Field Summary
-
-Fields
-
-Modifier and Type
-Field and Description
-
-
-static java.util.logging.Logger
-LOGGER
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-Lab5Server ()
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Field Detail
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-Lab5Server
-public Lab5Server()
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html b/Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html
deleted file mode 100644
index 8517b38..0000000
--- a/Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html
+++ /dev/null
@@ -1,295 +0,0 @@
-
-
-
-
-
-CommandLineHandlerServer (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-common.commandline.CommandLineHandler
-
-
-server.commandline.CommandLineHandlerServer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Nested Class Summary
-
-
-
-
-Nested classes/interfaces inherited from class common.commandline.CommandLineHandler
-common.commandline.CommandLineHandler.CommandLineNotInitialized, common.commandline.CommandLineHandler.ExecuteScriptCommand, common.commandline.CommandLineHandler.ExitCommand, common.commandline.CommandLineHandler.HistoryCommand
-
-
-
-
-
-
-
-
-Field Summary
-
-
-
-
-Fields inherited from class common.commandline.CommandLineHandler
-fileNames, history, inputs, instance, isActive, reader
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class common.commandline.CommandLineHandler
-addNewInput, awaitInput, awaitInput, awaitInput, awaitInput, awaitPassword, clearScreen, getInstance, getUser, input, isActive, removeInput, setUser, start, updateHistory
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-Detail:
-Field |
-Constr |
-Method
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/commandline/package-frame.html b/Lab5Server/build/docs/javadoc/server/commandline/package-frame.html
deleted file mode 100644
index 8cadcf6..0000000
--- a/Lab5Server/build/docs/javadoc/server/commandline/package-frame.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-server.commandline (Lab5Server 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/commandline/package-summary.html b/Lab5Server/build/docs/javadoc/server/commandline/package-summary.html
deleted file mode 100644
index 2c7faa6..0000000
--- a/Lab5Server/build/docs/javadoc/server/commandline/package-summary.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-server.commandline (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/commandline/package-tree.html b/Lab5Server/build/docs/javadoc/server/commandline/package-tree.html
deleted file mode 100644
index a1be6ab..0000000
--- a/Lab5Server/build/docs/javadoc/server/commandline/package-tree.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-server.commandline Class Hierarchy (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
Class Hierarchy
-
-java.lang.Object
-
-common.commandline.CommandLineHandler
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/net/UDPServer.html b/Lab5Server/build/docs/javadoc/server/net/UDPServer.html
deleted file mode 100644
index e4187ed..0000000
--- a/Lab5Server/build/docs/javadoc/server/net/UDPServer.html
+++ /dev/null
@@ -1,331 +0,0 @@
-
-
-
-
-
-UDPServer (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-java.lang.Object
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Summary
-
-Constructors
-
-Constructor and Description
-
-
-UDPServer (int port,
- java.util.logging.Logger logger)
-
-
-
-
-
-
-
-
-
-Method Summary
-
-
-
-
-
-Methods inherited from class java.lang.Object
-clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Constructor Detail
-
-
-
-
-
-
-
-
-
-
-
-Method Detail
-
-
-
-
-
-connect
-public void connect()
-
-
-
-
-
-
-
-disconnect
-public void disconnect()
-
-
-
-
-
-
-
-
-
-
-
-receive
-public void receive()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Prev Class
-Next Class
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/net/package-frame.html b/Lab5Server/build/docs/javadoc/server/net/package-frame.html
deleted file mode 100644
index 5ca76ac..0000000
--- a/Lab5Server/build/docs/javadoc/server/net/package-frame.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-server.net (Lab5Server 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/net/package-summary.html b/Lab5Server/build/docs/javadoc/server/net/package-summary.html
deleted file mode 100644
index 5724caf..0000000
--- a/Lab5Server/build/docs/javadoc/server/net/package-summary.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-server.net (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-Class Summary
-
-Class
-Description
-
-
-
-UDPServer
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/net/package-tree.html b/Lab5Server/build/docs/javadoc/server/net/package-tree.html
deleted file mode 100644
index f39ae58..0000000
--- a/Lab5Server/build/docs/javadoc/server/net/package-tree.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-server.net Class Hierarchy (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/package-frame.html b/Lab5Server/build/docs/javadoc/server/package-frame.html
deleted file mode 100644
index 280b213..0000000
--- a/Lab5Server/build/docs/javadoc/server/package-frame.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-server (Lab5Server 3.0 API)
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/package-summary.html b/Lab5Server/build/docs/javadoc/server/package-summary.html
deleted file mode 100644
index 66f9332..0000000
--- a/Lab5Server/build/docs/javadoc/server/package-summary.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-server (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-Class Summary
-
-Class
-Description
-
-
-
-Lab5Server
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/server/package-tree.html b/Lab5Server/build/docs/javadoc/server/package-tree.html
deleted file mode 100644
index dfc094c..0000000
--- a/Lab5Server/build/docs/javadoc/server/package-tree.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
-
-server Class Hierarchy (Lab5Server 3.0 API)
-
-
-
-
-
-
-JavaScript is disabled on your browser.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Lab5Server/build/docs/javadoc/stylesheet.css b/Lab5Server/build/docs/javadoc/stylesheet.css
deleted file mode 100644
index 98055b2..0000000
--- a/Lab5Server/build/docs/javadoc/stylesheet.css
+++ /dev/null
@@ -1,574 +0,0 @@
-/* Javadoc style sheet */
-/*
-Overall document style
-*/
-
-@import url('resources/fonts/dejavu.css');
-
-body {
- background-color:#ffffff;
- color:#353833;
- font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
- font-size:14px;
- margin:0;
-}
-a:link, a:visited {
- text-decoration:none;
- color:#4A6782;
-}
-a:hover, a:focus {
- text-decoration:none;
- color:#bb7a2a;
-}
-a:active {
- text-decoration:none;
- color:#4A6782;
-}
-a[name] {
- color:#353833;
-}
-a[name]:hover {
- text-decoration:none;
- color:#353833;
-}
-pre {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
-}
-h1 {
- font-size:20px;
-}
-h2 {
- font-size:18px;
-}
-h3 {
- font-size:16px;
- font-style:italic;
-}
-h4 {
- font-size:13px;
-}
-h5 {
- font-size:12px;
-}
-h6 {
- font-size:11px;
-}
-ul {
- list-style-type:disc;
-}
-code, tt {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- padding-top:4px;
- margin-top:8px;
- line-height:1.4em;
-}
-dt code {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- padding-top:4px;
-}
-table tr td dt code {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- vertical-align:top;
- padding-top:4px;
-}
-sup {
- font-size:8px;
-}
-/*
-Document title and Copyright styles
-*/
-.clear {
- clear:both;
- height:0px;
- overflow:hidden;
-}
-.aboutLanguage {
- float:right;
- padding:0px 21px;
- font-size:11px;
- z-index:200;
- margin-top:-9px;
-}
-.legalCopy {
- margin-left:.5em;
-}
-.bar a, .bar a:link, .bar a:visited, .bar a:active {
- color:#FFFFFF;
- text-decoration:none;
-}
-.bar a:hover, .bar a:focus {
- color:#bb7a2a;
-}
-.tab {
- background-color:#0066FF;
- color:#ffffff;
- padding:8px;
- width:5em;
- font-weight:bold;
-}
-/*
-Navigation bar styles
-*/
-.bar {
- background-color:#4D7A97;
- color:#FFFFFF;
- padding:.8em .5em .4em .8em;
- height:auto;/*height:1.8em;*/
- font-size:11px;
- margin:0;
-}
-.topNav {
- background-color:#4D7A97;
- color:#FFFFFF;
- float:left;
- padding:0;
- width:100%;
- clear:right;
- height:2.8em;
- padding-top:10px;
- overflow:hidden;
- font-size:12px;
-}
-.bottomNav {
- margin-top:10px;
- background-color:#4D7A97;
- color:#FFFFFF;
- float:left;
- padding:0;
- width:100%;
- clear:right;
- height:2.8em;
- padding-top:10px;
- overflow:hidden;
- font-size:12px;
-}
-.subNav {
- background-color:#dee3e9;
- float:left;
- width:100%;
- overflow:hidden;
- font-size:12px;
-}
-.subNav div {
- clear:left;
- float:left;
- padding:0 0 5px 6px;
- text-transform:uppercase;
-}
-ul.navList, ul.subNavList {
- float:left;
- margin:0 25px 0 0;
- padding:0;
-}
-ul.navList li{
- list-style:none;
- float:left;
- padding: 5px 6px;
- text-transform:uppercase;
-}
-ul.subNavList li{
- list-style:none;
- float:left;
-}
-.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
- color:#FFFFFF;
- text-decoration:none;
- text-transform:uppercase;
-}
-.topNav a:hover, .bottomNav a:hover {
- text-decoration:none;
- color:#bb7a2a;
- text-transform:uppercase;
-}
-.navBarCell1Rev {
- background-color:#F8981D;
- color:#253441;
- margin: auto 5px;
-}
-.skipNav {
- position:absolute;
- top:auto;
- left:-9999px;
- overflow:hidden;
-}
-/*
-Page header and footer styles
-*/
-.header, .footer {
- clear:both;
- margin:0 20px;
- padding:5px 0 0 0;
-}
-.indexHeader {
- margin:10px;
- position:relative;
-}
-.indexHeader span{
- margin-right:15px;
-}
-.indexHeader h1 {
- font-size:13px;
-}
-.title {
- color:#2c4557;
- margin:10px 0;
-}
-.subTitle {
- margin:5px 0 0 0;
-}
-.header ul {
- margin:0 0 15px 0;
- padding:0;
-}
-.footer ul {
- margin:20px 0 5px 0;
-}
-.header ul li, .footer ul li {
- list-style:none;
- font-size:13px;
-}
-/*
-Heading styles
-*/
-div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
- background-color:#dee3e9;
- border:1px solid #d0d9e0;
- margin:0 0 6px -8px;
- padding:7px 5px;
-}
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
- background-color:#dee3e9;
- border:1px solid #d0d9e0;
- margin:0 0 6px -8px;
- padding:7px 5px;
-}
-ul.blockList ul.blockList li.blockList h3 {
- padding:0;
- margin:15px 0;
-}
-ul.blockList li.blockList h2 {
- padding:0px 0 20px 0;
-}
-/*
-Page layout container styles
-*/
-.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
- clear:both;
- padding:10px 20px;
- position:relative;
-}
-.indexContainer {
- margin:10px;
- position:relative;
- font-size:12px;
-}
-.indexContainer h2 {
- font-size:13px;
- padding:0 0 3px 0;
-}
-.indexContainer ul {
- margin:0;
- padding:0;
-}
-.indexContainer ul li {
- list-style:none;
- padding-top:2px;
-}
-.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
- font-size:12px;
- font-weight:bold;
- margin:10px 0 0 0;
- color:#4E4E4E;
-}
-.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
- margin:5px 0 10px 0px;
- font-size:14px;
- font-family:'DejaVu Sans Mono',monospace;
-}
-.serializedFormContainer dl.nameValue dt {
- margin-left:1px;
- font-size:1.1em;
- display:inline;
- font-weight:bold;
-}
-.serializedFormContainer dl.nameValue dd {
- margin:0 0 0 1px;
- font-size:1.1em;
- display:inline;
-}
-/*
-List styles
-*/
-ul.horizontal li {
- display:inline;
- font-size:0.9em;
-}
-ul.inheritance {
- margin:0;
- padding:0;
-}
-ul.inheritance li {
- display:inline;
- list-style:none;
-}
-ul.inheritance li ul.inheritance {
- margin-left:15px;
- padding-left:15px;
- padding-top:1px;
-}
-ul.blockList, ul.blockListLast {
- margin:10px 0 10px 0;
- padding:0;
-}
-ul.blockList li.blockList, ul.blockListLast li.blockList {
- list-style:none;
- margin-bottom:15px;
- line-height:1.4;
-}
-ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
- padding:0px 20px 5px 10px;
- border:1px solid #ededed;
- background-color:#f8f8f8;
-}
-ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
- padding:0 0 5px 8px;
- background-color:#ffffff;
- border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
- margin-left:0;
- padding-left:0;
- padding-bottom:15px;
- border:none;
-}
-ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
- list-style:none;
- border-bottom:none;
- padding-bottom:0;
-}
-table tr td dl, table tr td dl dt, table tr td dl dd {
- margin-top:0;
- margin-bottom:1px;
-}
-/*
-Table styles
-*/
-.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
- width:100%;
- border-left:1px solid #EEE;
- border-right:1px solid #EEE;
- border-bottom:1px solid #EEE;
-}
-.overviewSummary, .memberSummary {
- padding:0px;
-}
-.overviewSummary caption, .memberSummary caption, .typeSummary caption,
-.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
- position:relative;
- text-align:left;
- background-repeat:no-repeat;
- color:#253441;
- font-weight:bold;
- clear:none;
- overflow:hidden;
- padding:0px;
- padding-top:10px;
- padding-left:1px;
- margin:0px;
- white-space:pre;
-}
-.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
-.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
-.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
-.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
-.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
-.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
-.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
-.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
- color:#FFFFFF;
-}
-.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- padding-bottom:7px;
- display:inline-block;
- float:left;
- background-color:#F8981D;
- border: none;
- height:16px;
-}
-.memberSummary caption span.activeTableTab span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- margin-right:3px;
- display:inline-block;
- float:left;
- background-color:#F8981D;
- height:16px;
-}
-.memberSummary caption span.tableTab span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- margin-right:3px;
- display:inline-block;
- float:left;
- background-color:#4D7A97;
- height:16px;
-}
-.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
- padding-top:0px;
- padding-left:0px;
- padding-right:0px;
- background-image:none;
- float:none;
- display:inline;
-}
-.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
- display:none;
- width:5px;
- position:relative;
- float:left;
- background-color:#F8981D;
-}
-.memberSummary .activeTableTab .tabEnd {
- display:none;
- width:5px;
- margin-right:3px;
- position:relative;
- float:left;
- background-color:#F8981D;
-}
-.memberSummary .tableTab .tabEnd {
- display:none;
- width:5px;
- margin-right:3px;
- position:relative;
- background-color:#4D7A97;
- float:left;
-
-}
-.overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td {
- text-align:left;
- padding:0px 0px 12px 10px;
-}
-th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
-td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
- vertical-align:top;
- padding-right:0px;
- padding-top:8px;
- padding-bottom:3px;
-}
-th.colFirst, th.colLast, th.colOne, .constantsSummary th {
- background:#dee3e9;
- text-align:left;
- padding:8px 3px 3px 7px;
-}
-td.colFirst, th.colFirst {
- white-space:nowrap;
- font-size:13px;
-}
-td.colLast, th.colLast {
- font-size:13px;
-}
-td.colOne, th.colOne {
- font-size:13px;
-}
-.overviewSummary td.colFirst, .overviewSummary th.colFirst,
-.useSummary td.colFirst, .useSummary th.colFirst,
-.overviewSummary td.colOne, .overviewSummary th.colOne,
-.memberSummary td.colFirst, .memberSummary th.colFirst,
-.memberSummary td.colOne, .memberSummary th.colOne,
-.typeSummary td.colFirst{
- width:25%;
- vertical-align:top;
-}
-td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
- font-weight:bold;
-}
-.tableSubHeadingColor {
- background-color:#EEEEFF;
-}
-.altColor {
- background-color:#FFFFFF;
-}
-.rowColor {
- background-color:#EEEEEF;
-}
-/*
-Content styles
-*/
-.description pre {
- margin-top:0;
-}
-.deprecatedContent {
- margin:0;
- padding:10px 0;
-}
-.docSummary {
- padding:0;
-}
-
-ul.blockList ul.blockList ul.blockList li.blockList h3 {
- font-style:normal;
-}
-
-div.block {
- font-size:14px;
- font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-
-td.colLast div {
- padding-top:0px;
-}
-
-
-td.colLast a {
- padding-bottom:3px;
-}
-/*
-Formatting effect styles
-*/
-.sourceLineNo {
- color:green;
- padding:0 30px 0 0;
-}
-h1.hidden {
- visibility:hidden;
- overflow:hidden;
- font-size:10px;
-}
-.block {
- display:block;
- margin:3px 10px 2px 0px;
- color:#474747;
-}
-.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
-.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
-.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
- font-weight:bold;
-}
-.deprecationComment, .emphasizedPhrase, .interfaceName {
- font-style:italic;
-}
-
-div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
-div.block div.block span.interfaceName {
- font-style:normal;
-}
-
-div.contentContainer ul.blockList li.blockList h2{
- padding-bottom:0px;
-}
diff --git a/Lab5Server/build/libs/Lab5Server-2.2.jar b/Lab5Server/build/libs/Lab5Server-2.2.jar
deleted file mode 100644
index cb68b09..0000000
Binary files a/Lab5Server/build/libs/Lab5Server-2.2.jar and /dev/null differ
diff --git a/Lab5Server/build/libs/Lab5Server-3.0.jar b/Lab5Server/build/libs/Lab5Server-3.0.jar
deleted file mode 100644
index 12a4ea0..0000000
Binary files a/Lab5Server/build/libs/Lab5Server-3.0.jar and /dev/null differ
diff --git a/Lab5Server/build/libs/connection.properties b/Lab5Server/build/libs/connection.properties
deleted file mode 100644
index 81783a6..0000000
--- a/Lab5Server/build/libs/connection.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-hostname=localhost
-port=1234
-db_host=helios.se.ifmo.ru
-db_port=5432
-db_name=studs
diff --git a/Lab5Server/build/libs/connection.properties.bak b/Lab5Server/build/libs/connection.properties.bak
deleted file mode 100644
index f5630d4..0000000
--- a/Lab5Server/build/libs/connection.properties.bak
+++ /dev/null
@@ -1,2 +0,0 @@
-hostname=localhost
-port=1234
\ No newline at end of file
diff --git a/Lab5Server/build/libs/lab5.xml b/Lab5Server/build/libs/lab5.xml
deleted file mode 100644
index 2cbb2fa..0000000
--- a/Lab5Server/build/libs/lab5.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- pop
-
- 2.0
- 2.0
-
- 2022-05-16
- 1321
- 321312321312
- BLACK
- CHINA
-
- 2.0
- 2.0
- 2
- 2
-
-
-
- san
-
- 2.0
- 2.0
-
- 2022-05-16
- 3123
- 3213213321
- BLACK
- CHINA
-
- 2.0
- 2.0
- 2
- 2
-
-
-
- wasd
-
- 2.0
- 2.0
-
- 2022-05-16
- 321
- 321312321321
- BLACK
- CHINA
-
- 2.0
- 2.0
- 2
- 2
-
-
- 2022-05-10
-
diff --git a/Lab5Server/build/libs/postgresql-42.4.0.jar b/Lab5Server/build/libs/postgresql-42.4.0.jar
deleted file mode 100644
index dd6024d..0000000
Binary files a/Lab5Server/build/libs/postgresql-42.4.0.jar and /dev/null differ
diff --git a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin
deleted file mode 100644
index b0d89d6..0000000
Binary files a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ
diff --git a/Lab5Server/build/tmp/jar/MANIFEST.MF b/Lab5Server/build/tmp/jar/MANIFEST.MF
deleted file mode 100644
index 3c951fd..0000000
--- a/Lab5Server/build/tmp/jar/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: client.Lab5Server
-
diff --git a/Lab5Server/build/tmp/javadoc/javadoc.options b/Lab5Server/build/tmp/javadoc/javadoc.options
deleted file mode 100644
index e619fdf..0000000
--- a/Lab5Server/build/tmp/javadoc/javadoc.options
+++ /dev/null
@@ -1,10 +0,0 @@
--classpath 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\build\\classes\\java\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\build\\resources\\main;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\build\\libs\\postgresql-42.4.0.jar;C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\build\\libs\\Lab5Core-3.0.jar'
--d 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\build\\docs\\javadoc'
--doctitle 'Lab5Server 3.0 API'
--encoding 'UTF-8'
--notimestamp
--quiet
--windowtitle 'Lab5Server 3.0 API'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\src\\main\\java\\server\\commandline\\CommandLineHandlerServer.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\src\\main\\java\\server\\Lab5Server.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Server\\src\\main\\java\\server\\net\\UDPServer.java'
diff --git a/Lab5Server/build/tmp/shadowJar/MANIFEST.MF b/Lab5Server/build/tmp/shadowJar/MANIFEST.MF
deleted file mode 100644
index ab5df96..0000000
--- a/Lab5Server/build/tmp/shadowJar/MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: postgresql-42.4.0.jar
-Main-Class: server.Lab5Server
-
diff --git a/Lab5Server/src/main/java/server/Lab5Server.java b/Lab5Server/src/main/java/server/Lab5Server.java
index 33509f5..848d711 100644
--- a/Lab5Server/src/main/java/server/Lab5Server.java
+++ b/Lab5Server/src/main/java/server/Lab5Server.java
@@ -30,14 +30,7 @@ public class Lab5Server {
LOGGER.severe("Ошибка при получении коллекции из базы данных");
}
- // Runtime.getRuntime().addShutdownHook(new Thread());
-
- Thread conThread = new Thread(() -> {
- while (true)
- udp.receive();
- });
- conThread.setDaemon(true);
- conThread.start();
+ udp.handleRequests();
cmd.start();
}
diff --git a/Lab5Server/src/main/java/server/net/UDPServer.java b/Lab5Server/src/main/java/server/net/UDPServer.java
index 682875d..a30233f 100644
--- a/Lab5Server/src/main/java/server/net/UDPServer.java
+++ b/Lab5Server/src/main/java/server/net/UDPServer.java
@@ -16,6 +16,9 @@ import java.io.*;
import java.net.*;
import java.sql.*;
import java.util.Locale;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinTask;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger;
import static common.commandline.pdcommands.PeopleDatabaseCommands.peopleCollection;
@@ -33,6 +36,17 @@ public class UDPServer {
this.logger = logger;
}
+ public void handleRequests() {
+ UtilFunctions.startNewThread(() -> {
+ while (true) {
+ receiveRequest();
+ try {
+ Thread.sleep(10);
+ } catch (InterruptedException ignored) {}
+ }
+ }, true);
+ }
+
public void connect() {
logger.info("Подключаемся...");
do {
@@ -128,21 +142,15 @@ public class UDPServer {
logger.info("Результат отправлен клиенту");
}
- public void receive() {
- logger.info("Ожидаем отправки данных от клиента...");
- byte[] buffer = new byte[BUFFER_SIZE];
- DatagramPacket request = new DatagramPacket(buffer, buffer.length);
+ public void read(DatagramPacket request) {
+ AtomicInteger
+ logger.info("Запрос получен, считываем...");
CommandResult result;
- try (ByteArrayInputStream byteInputStream = new ByteArrayInputStream(buffer)) {
- socket.receive(request);
- logger.info("Данные получены, десериализуем...");
- ObjectInputStream objectInputStream = new ObjectInputStream(byteInputStream);
+ try (ByteArrayInputStream byteInputStream = new ByteArrayInputStream(request.getData());
+ ObjectInputStream objectInputStream = new ObjectInputStream(byteInputStream)) {
Command command = (Command) objectInputStream.readObject();
Object[] args = (Object[]) objectInputStream.readObject();
- objectInputStream.close();
- args = PlaceHolder.replacePlaceHoldersWith(args, peopleCollection, db_connection);
- logger.info(String.format("Выполняется команда %s", command.getAlias()));
- result = command.execute(args);
+ result = this.execute(command, args);
} catch (IOException e) {
e.printStackTrace();
result = onReceiveException("Не удалось преобразовать полученные данные, данные были повреждены во время передачи",
@@ -160,6 +168,26 @@ public class UDPServer {
send(result, request.getAddress(), request.getPort());
}
+ public CommandResult execute(Command command, Object[] args) {
+ logger.info(String.format("Выполняется команда %s", command.getAlias()));
+ ForkJoinPool pool = new ForkJoinPool();
+ Object[] argsModified = PlaceHolder.replacePlaceHoldersWith(args, peopleCollection, db_connection);
+ return pool.invoke(ForkJoinTask.adapt(() -> command.execute(argsModified)));
+ }
+
+ public void receiveRequest() {
+ logger.info("Ожидаем отправки данных от клиента...");
+ byte[] buffer = new byte[BUFFER_SIZE];
+ DatagramPacket request = new DatagramPacket(buffer, buffer.length);
+ try {
+ socket.receive(request);
+ } catch (IOException e) {
+ e.printStackTrace();
+ logger.severe("Что-то пошло не так");
+ }
+ UtilFunctions.startNewThread(() -> read(request), false);
+ }
+
private CommandResult onReceiveException(String msg, Response response) {
logger.severe(msg);
return new CommandResult(response.getMsg(), response);
diff --git a/deploy.ps1 b/deploy.ps1
new file mode 100644
index 0000000..ffd042a
--- /dev/null
+++ b/deploy.ps1
@@ -0,0 +1,2 @@
+scp -P2222 .\Lab5Server\build\libs\Lab5Server-3.0.jar s316304@helios.se.ifmo.ru:~/prog/lab7/server
+scp -P2222 .\Lab5Client\build\libs\Lab5Client-3.0.jar s316304@helios.se.ifmo.ru:~/prog/lab7/client
\ No newline at end of file