diff --git a/Lab5Client/build.gradle.kts b/Lab5Client/build.gradle.kts
index 0a67c5d..cc1a502 100644
--- a/Lab5Client/build.gradle.kts
+++ b/Lab5Client/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "ru.erius.lab5"
-version = "2.2"
+version = "3.0"
 val mainClass = "client.Lab5Client"
 
 repositories {
diff --git a/Lab5Client/build/classes/java/main/client/Lab5Client.class b/Lab5Client/build/classes/java/main/client/Lab5Client.class
index bcafd23..e826611 100644
Binary files a/Lab5Client/build/classes/java/main/client/Lab5Client.class and b/Lab5Client/build/classes/java/main/client/Lab5Client.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient$ConnectionCommand.class b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient$ConnectionCommand.class
new file mode 100644
index 0000000..9ae6679
Binary files /dev/null and b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient$ConnectionCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class
new file mode 100644
index 0000000..9f77ccb
Binary files /dev/null and b/Lab5Client/build/classes/java/main/client/commandline/CommandLineHandlerClient.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddCommand.class
index 972371c..0adcc08 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMaxCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMaxCommand.class
index 0f3d435..956116d 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMaxCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMaxCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMinCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMinCommand.class
index 2fa6f00..fb1261b 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMinCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/AddIfMinCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ClearCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ClearCommand.class
index ad36678..ad26f3e 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ClearCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ClearCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/FilterContainsNameCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/FilterContainsNameCommand.class
index 76be4ba..39ce1ac 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/FilterContainsNameCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/FilterContainsNameCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/InfoCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/InfoCommand.class
index 786e165..ab753cb 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/InfoCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/InfoCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.class
index e6f8df3..b16a9fb 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/RemoveByIdCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/RemoveByIdCommand.class
index 0367f33..b593c6e 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/RemoveByIdCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/RemoveByIdCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ShowCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ShowCommand.class
index 08e3bec..62bf0eb 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ShowCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/ShowCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/SumOfHeightCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/SumOfHeightCommand.class
index 931dd2d..118da85 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/SumOfHeightCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/SumOfHeightCommand.class differ
diff --git a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/UpdateCommand.class b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/UpdateCommand.class
index 211e836..2d68187 100644
Binary files a/Lab5Client/build/classes/java/main/client/commandline/pdcommands/UpdateCommand.class and b/Lab5Client/build/classes/java/main/client/commandline/pdcommands/UpdateCommand.class differ
diff --git a/Lab5Client/build/docs/javadoc/allclasses-frame.html b/Lab5Client/build/docs/javadoc/allclasses-frame.html
index 4ec48f9..76d4a56 100644
--- a/Lab5Client/build/docs/javadoc/allclasses-frame.html
+++ b/Lab5Client/build/docs/javadoc/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Client 2.2 API)</title>
+<title>All Classes (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/allclasses-noframe.html b/Lab5Client/build/docs/javadoc/allclasses-noframe.html
index cbe2878..f810dff 100644
--- a/Lab5Client/build/docs/javadoc/allclasses-noframe.html
+++ b/Lab5Client/build/docs/javadoc/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Client 2.2 API)</title>
+<title>All Classes (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/client/Lab5Client.html b/Lab5Client/build/docs/javadoc/client/Lab5Client.html
index b9c6451..daa84de 100644
--- a/Lab5Client/build/docs/javadoc/client/Lab5Client.html
+++ b/Lab5Client/build/docs/javadoc/client/Lab5Client.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Client (Lab5Client 2.2 API)</title>
+<title>Lab5Client (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Lab5Client (Lab5Client 2.2 API)";
+            parent.document.title="Lab5Client (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.NameAdapter.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.ConnectionCommand.html
similarity index 67%
rename from Lab5Core/build/docs/javadoc/common/parser/Adapters.NameAdapter.html
rename to Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.ConnectionCommand.html
index bab3e26..56d1f1d 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.NameAdapter.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.ConnectionCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.NameAdapter (Lab5Core 2.2 API)</title>
+<title>CommandLineHandlerClient.ConnectionCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.NameAdapter (Lab5Core 2.2 API)";
+            parent.document.title="CommandLineHandlerClient.ConnectionCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10};
+var methods = {"i0":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -47,12 +47,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.PassportAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../client/commandline/CommandLineHandlerClient.html" title="class in client.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.NameAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.NameAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?client/commandline/CommandLineHandlerClient.ConnectionCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandlerClient.ConnectionCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,7 +73,7 @@ var activeTableTab = "activeTableTab";
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
@@ -90,18 +90,18 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">common.parser</div>
-<h2 title="Class Adapters.NameAdapter" class="title">Class Adapters.NameAdapter</h2>
+<div class="subTitle">client.commandline</div>
+<h2 title="Class CommandLineHandlerClient.ConnectionCommand" class="title">Class CommandLineHandlerClient.ConnectionCommand</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.String&gt;</li>
+<li>common.commandline.Command</li>
 <li>
 <ul class="inheritance">
-<li>common.parser.Adapters.NameAdapter</li>
+<li>client.commandline.CommandLineHandlerClient.ConnectionCommand</li>
 </ul>
 </li>
 </ul>
@@ -111,19 +111,42 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
 <dt>Enclosing class:</dt>
-<dd><a href="../../common/parser/Adapters.html" title="class in common.parser">Adapters</a></dd>
+<dd><a href="../../client/commandline/CommandLineHandlerClient.html" title="class in client.commandline">CommandLineHandlerClient</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">Adapters.NameAdapter</span>
-extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.String&gt;</pre>
+<pre>public class <span class="typeNameLabel">CommandLineHandlerClient.ConnectionCommand</span>
+extends common.commandline.Command</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#client.commandline.CommandLineHandlerClient.ConnectionCommand">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;common.commandline.Command</h3>
+<code>alias, args, clientOnly, description, executable</code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -136,7 +159,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.NameAdapter.html#NameAdapter--">NameAdapter</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandlerClient.ConnectionCommand.html#ConnectionCommand--">ConnectionCommand</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -154,15 +177,18 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.NameAdapter.html#marshal-java.lang.String-">marshal</a></span>(java.lang.String&nbsp;v)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.NameAdapter.html#unmarshal-java.lang.String-">unmarshal</a></span>(java.lang.String&nbsp;v)</code>&nbsp;</td>
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandlerClient.ConnectionCommand.html#validate-java.lang.String:A-">validate</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;common.commandline.Command</h3>
+<code>executeOnClient, getAlias, getArgs, getDescription, getExecutable, isClientOnly, setExecutable</code></li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -183,13 +209,13 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="NameAdapter--">
+<a name="ConnectionCommand--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>NameAdapter</h4>
-<pre>public&nbsp;NameAdapter()</pre>
+<h4>ConnectionCommand</h4>
+<pre>public&nbsp;ConnectionCommand()</pre>
 </li>
 </ul>
 </li>
@@ -200,35 +226,16 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="unmarshal-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unmarshal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;unmarshal(java.lang.String&nbsp;v)
-                           throws java.lang.Exception</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>unmarshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.String&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
-</dl>
-</li>
-</ul>
-<a name="marshal-java.lang.String-">
+<a name="validate-java.lang.String:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>marshal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;marshal(java.lang.String&nbsp;v)
-                         throws java.lang.Exception</pre>
+<h4>validate</h4>
+<pre>public&nbsp;boolean&nbsp;validate(java.lang.String[]&nbsp;args)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>marshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.String&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
+<dd><code>validate</code>&nbsp;in class&nbsp;<code>common.commandline.Command</code></dd>
 </dl>
 </li>
 </ul>
@@ -259,12 +266,12 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.PassportAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../client/commandline/CommandLineHandlerClient.html" title="class in client.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.NameAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.NameAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?client/commandline/CommandLineHandlerClient.ConnectionCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandlerClient.ConnectionCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -285,7 +292,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html
new file mode 100644
index 0000000..c9f935c
--- /dev/null
+++ b/Lab5Client/build/docs/javadoc/client/commandline/CommandLineHandlerClient.html
@@ -0,0 +1,321 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>CommandLineHandlerClient (Lab5Client 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="CommandLineHandlerClient (Lab5Client 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../client/commandline/CommandLineHandlerClient.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?client/commandline/CommandLineHandlerClient.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandlerClient.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.CommandLineHandler">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">client.commandline</div>
+<h2 title="Class CommandLineHandlerClient" class="title">Class CommandLineHandlerClient</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.CommandLineHandler</li>
+<li>
+<ul class="inheritance">
+<li>client.commandline.CommandLineHandlerClient</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">CommandLineHandlerClient</span>
+extends common.commandline.CommandLineHandler</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandlerClient.ConnectionCommand.html" title="class in client.commandline">CommandLineHandlerClient.ConnectionCommand</a></span></code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.common.commandline.CommandLineHandler">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;common.commandline.CommandLineHandler</h3>
+<code>common.commandline.CommandLineHandler.CommandLineNotInitialized, common.commandline.CommandLineHandler.ExecuteScriptCommand, common.commandline.CommandLineHandler.ExitCommand, common.commandline.CommandLineHandler.HistoryCommand</code></li>
+</ul>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.common.commandline.CommandLineHandler">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;common.commandline.CommandLineHandler</h3>
+<code>fileNames, history, inputs, instance, isActive, reader</code></li>
+</ul>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandlerClient.html#executeCommand-java.lang.String-java.lang.String:A-">executeCommand</a></span>(java.lang.String&nbsp;alias,
+              java.lang.String[]&nbsp;args)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>common.commandline.response.CommandResult</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandlerClient.html#executeOnServer-client.net.UDPClient-common.commandline.Command-">executeOnServer</a></span>(<a href="../../client/net/UDPClient.html" title="class in client.net">UDPClient</a>&nbsp;udp,
+               common.commandline.Command&nbsp;command)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static common.commandline.CommandLineHandler</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../client/commandline/CommandLineHandlerClient.html#getClientCommandLine--">getClientCommandLine</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.common.commandline.CommandLineHandler">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;common.commandline.CommandLineHandler</h3>
+<code>addNewInput, awaitInput, awaitInput, awaitInput, clearScreen, executeScript, exit, getInstance, history, history, input, isActive, removeInput, start, updateHistory</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getClientCommandLine--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getClientCommandLine</h4>
+<pre>public static&nbsp;common.commandline.CommandLineHandler&nbsp;getClientCommandLine()</pre>
+</li>
+</ul>
+<a name="executeCommand-java.lang.String-java.lang.String:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>executeCommand</h4>
+<pre>protected&nbsp;void&nbsp;executeCommand(java.lang.String&nbsp;alias,
+                              java.lang.String[]&nbsp;args)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>executeCommand</code>&nbsp;in class&nbsp;<code>common.commandline.CommandLineHandler</code></dd>
+</dl>
+</li>
+</ul>
+<a name="executeOnServer-client.net.UDPClient-common.commandline.Command-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>executeOnServer</h4>
+<pre>public&nbsp;common.commandline.response.CommandResult&nbsp;executeOnServer(<a href="../../client/net/UDPClient.html" title="class in client.net">UDPClient</a>&nbsp;udp,
+                                                                 common.commandline.Command&nbsp;command)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../client/commandline/CommandLineHandlerClient.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?client/commandline/CommandLineHandlerClient.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandlerClient.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.CommandLineHandler">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html b/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html
index f36f150..868717c 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline (Lab5Client 2.2 API)</title>
+<title>client.commandline (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html b/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html
index b1bb4f6..5734ef7 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline (Lab5Client 2.2 API)</title>
+<title>client.commandline (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.commandline (Lab5Client 2.2 API)";
+            parent.document.title="client.commandline (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html b/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html
index 09c7d8a..e14ce45 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline Class Hierarchy (Lab5Client 2.2 API)</title>
+<title>client.commandline Class Hierarchy (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.commandline Class Hierarchy (Lab5Client 2.2 API)";
+            parent.document.title="client.commandline Class Hierarchy (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
@@ -82,7 +82,6 @@
 <li type="circle">common.commandline.Command (implements java.io.Serializable)
 <ul>
 <li type="circle">client.commandline.<a href="../../client/commandline/CommandLineHandlerClient.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandlerClient.ConnectionCommand</span></a></li>
-<li type="circle">client.commandline.<a href="../../client/commandline/CommandLineHandlerClient.ModeCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandlerClient.ModeCommand</span></a></li>
 </ul>
 </li>
 <li type="circle">common.commandline.CommandLineHandler
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddCommand.html
index a46a9c9..38898d4 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>AddCommand (Lab5Client 2.2 API)</title>
+<title>AddCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AddCommand (Lab5Client 2.2 API)";
+            parent.document.title="AddCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMaxCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMaxCommand.html
index 7ee278a..18f8a99 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMaxCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMaxCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>AddIfMaxCommand (Lab5Client 2.2 API)</title>
+<title>AddIfMaxCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AddIfMaxCommand (Lab5Client 2.2 API)";
+            parent.document.title="AddIfMaxCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMinCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMinCommand.html
index 621bf4f..5b7e1b3 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMinCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/AddIfMinCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>AddIfMinCommand (Lab5Client 2.2 API)</title>
+<title>AddIfMinCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AddIfMinCommand (Lab5Client 2.2 API)";
+            parent.document.title="AddIfMinCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ClearCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ClearCommand.html
index dffd119..ab36d9e 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ClearCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ClearCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>ClearCommand (Lab5Client 2.2 API)</title>
+<title>ClearCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ClearCommand (Lab5Client 2.2 API)";
+            parent.document.title="ClearCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/FilterContainsNameCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/FilterContainsNameCommand.html
index 031a047..86d1d0f 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/FilterContainsNameCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/FilterContainsNameCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>FilterContainsNameCommand (Lab5Client 2.2 API)</title>
+<title>FilterContainsNameCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FilterContainsNameCommand (Lab5Client 2.2 API)";
+            parent.document.title="FilterContainsNameCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/InfoCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/InfoCommand.html
index a4628c3..33ca660 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/InfoCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/InfoCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>InfoCommand (Lab5Client 2.2 API)</title>
+<title>InfoCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InfoCommand (Lab5Client 2.2 API)";
+            parent.document.title="InfoCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.html
index 52c52d2..2425a16 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>PrintFieldDescendingLocationCommand (Lab5Client 2.2 API)</title>
+<title>PrintFieldDescendingLocationCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PrintFieldDescendingLocationCommand (Lab5Client 2.2 API)";
+            parent.document.title="PrintFieldDescendingLocationCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/RemoveByIdCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/RemoveByIdCommand.html
index 605a152..48ba59a 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/RemoveByIdCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/RemoveByIdCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>RemoveByIdCommand (Lab5Client 2.2 API)</title>
+<title>RemoveByIdCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="RemoveByIdCommand (Lab5Client 2.2 API)";
+            parent.document.title="RemoveByIdCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ShowCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ShowCommand.html
index c829aa4..03ed7d0 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ShowCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/ShowCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>ShowCommand (Lab5Client 2.2 API)</title>
+<title>ShowCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ShowCommand (Lab5Client 2.2 API)";
+            parent.document.title="ShowCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SumOfHeightCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SumOfHeightCommand.html
index 5f2f944..98d9998 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SumOfHeightCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/SumOfHeightCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>SumOfHeightCommand (Lab5Client 2.2 API)</title>
+<title>SumOfHeightCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SumOfHeightCommand (Lab5Client 2.2 API)";
+            parent.document.title="SumOfHeightCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/UpdateCommand.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/UpdateCommand.html
index 7e0679e..efe14aa 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/UpdateCommand.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/UpdateCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>UpdateCommand (Lab5Client 2.2 API)</title>
+<title>UpdateCommand (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UpdateCommand (Lab5Client 2.2 API)";
+            parent.document.title="UpdateCommand (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-frame.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-frame.html
index 5b88d1a..9715176 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-frame.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline.pdcommands (Lab5Client 2.2 API)</title>
+<title>client.commandline.pdcommands (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-summary.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-summary.html
index d9487b7..3731b96 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-summary.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline.pdcommands (Lab5Client 2.2 API)</title>
+<title>client.commandline.pdcommands (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.commandline.pdcommands (Lab5Client 2.2 API)";
+            parent.document.title="client.commandline.pdcommands (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-tree.html b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-tree.html
index 300959d..7ddc08d 100644
--- a/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-tree.html
+++ b/Lab5Client/build/docs/javadoc/client/commandline/pdcommands/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.commandline.pdcommands Class Hierarchy (Lab5Client 2.2 API)</title>
+<title>client.commandline.pdcommands Class Hierarchy (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.commandline.pdcommands Class Hierarchy (Lab5Client 2.2 API)";
+            parent.document.title="client.commandline.pdcommands Class Hierarchy (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/net/UDPClient.html b/Lab5Client/build/docs/javadoc/client/net/UDPClient.html
index 6c188a5..b373700 100644
--- a/Lab5Client/build/docs/javadoc/client/net/UDPClient.html
+++ b/Lab5Client/build/docs/javadoc/client/net/UDPClient.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>UDPClient (Lab5Client 2.2 API)</title>
+<title>UDPClient (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UDPClient (Lab5Client 2.2 API)";
+            parent.document.title="UDPClient (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/net/package-frame.html b/Lab5Client/build/docs/javadoc/client/net/package-frame.html
index 7b2596d..ba9a307 100644
--- a/Lab5Client/build/docs/javadoc/client/net/package-frame.html
+++ b/Lab5Client/build/docs/javadoc/client/net/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.net (Lab5Client 2.2 API)</title>
+<title>client.net (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/client/net/package-summary.html b/Lab5Client/build/docs/javadoc/client/net/package-summary.html
index 2283ba4..99c24c3 100644
--- a/Lab5Client/build/docs/javadoc/client/net/package-summary.html
+++ b/Lab5Client/build/docs/javadoc/client/net/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.net (Lab5Client 2.2 API)</title>
+<title>client.net (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.net (Lab5Client 2.2 API)";
+            parent.document.title="client.net (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/net/package-tree.html b/Lab5Client/build/docs/javadoc/client/net/package-tree.html
index 70c6d97..341e772 100644
--- a/Lab5Client/build/docs/javadoc/client/net/package-tree.html
+++ b/Lab5Client/build/docs/javadoc/client/net/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client.net Class Hierarchy (Lab5Client 2.2 API)</title>
+<title>client.net Class Hierarchy (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client.net Class Hierarchy (Lab5Client 2.2 API)";
+            parent.document.title="client.net Class Hierarchy (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/package-frame.html b/Lab5Client/build/docs/javadoc/client/package-frame.html
index c593ad2..00f0845 100644
--- a/Lab5Client/build/docs/javadoc/client/package-frame.html
+++ b/Lab5Client/build/docs/javadoc/client/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client (Lab5Client 2.2 API)</title>
+<title>client (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/client/package-summary.html b/Lab5Client/build/docs/javadoc/client/package-summary.html
index fc2e901..45757c8 100644
--- a/Lab5Client/build/docs/javadoc/client/package-summary.html
+++ b/Lab5Client/build/docs/javadoc/client/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client (Lab5Client 2.2 API)</title>
+<title>client (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client (Lab5Client 2.2 API)";
+            parent.document.title="client (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/client/package-tree.html b/Lab5Client/build/docs/javadoc/client/package-tree.html
index 80d6dce..b5bbe67 100644
--- a/Lab5Client/build/docs/javadoc/client/package-tree.html
+++ b/Lab5Client/build/docs/javadoc/client/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>client Class Hierarchy (Lab5Client 2.2 API)</title>
+<title>client Class Hierarchy (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="client Class Hierarchy (Lab5Client 2.2 API)";
+            parent.document.title="client Class Hierarchy (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/constant-values.html b/Lab5Client/build/docs/javadoc/constant-values.html
index 9d1be83..730af22 100644
--- a/Lab5Client/build/docs/javadoc/constant-values.html
+++ b/Lab5Client/build/docs/javadoc/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (Lab5Client 2.2 API)</title>
+<title>Constant Field Values (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (Lab5Client 2.2 API)";
+            parent.document.title="Constant Field Values (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/deprecated-list.html b/Lab5Client/build/docs/javadoc/deprecated-list.html
index e7fa21a..fe627bf 100644
--- a/Lab5Client/build/docs/javadoc/deprecated-list.html
+++ b/Lab5Client/build/docs/javadoc/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (Lab5Client 2.2 API)</title>
+<title>Deprecated List (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (Lab5Client 2.2 API)";
+            parent.document.title="Deprecated List (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/help-doc.html b/Lab5Client/build/docs/javadoc/help-doc.html
index 6d0fc2e..4e5a403 100644
--- a/Lab5Client/build/docs/javadoc/help-doc.html
+++ b/Lab5Client/build/docs/javadoc/help-doc.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (Lab5Client 2.2 API)</title>
+<title>API Help (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (Lab5Client 2.2 API)";
+            parent.document.title="API Help (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Client/build/docs/javadoc/index-all.html b/Lab5Client/build/docs/javadoc/index-all.html
index 7888fa1..3a1b1ac 100644
--- a/Lab5Client/build/docs/javadoc/index-all.html
+++ b/Lab5Client/build/docs/javadoc/index-all.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (Lab5Client 2.2 API)</title>
+<title>Index (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (Lab5Client 2.2 API)";
+            parent.document.title="Index (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
@@ -106,8 +106,6 @@
 <dd>&nbsp;</dd>
 <dt><a href="client/commandline/CommandLineHandlerClient.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandlerClient.ConnectionCommand</span></a> - Class in <a href="client/commandline/package-summary.html">client.commandline</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="client/commandline/CommandLineHandlerClient.ModeCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandlerClient.ModeCommand</span></a> - Class in <a href="client/commandline/package-summary.html">client.commandline</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/net/UDPClient.html#connect--">connect()</a></span> - Method in class client.net.<a href="client/net/UDPClient.html" title="class in client.net">UDPClient</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/commandline/CommandLineHandlerClient.ConnectionCommand.html#ConnectionCommand--">ConnectionCommand()</a></span> - Constructor for class client.commandline.<a href="client/commandline/CommandLineHandlerClient.ConnectionCommand.html" title="class in client.commandline">CommandLineHandlerClient.ConnectionCommand</a></dt>
@@ -180,8 +178,6 @@
 <dl>
 <dt><span class="memberNameLink"><a href="client/Lab5Client.html#main-java.lang.String:A-">main(String[])</a></span> - Static method in class client.<a href="client/Lab5Client.html" title="class in client">Lab5Client</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="client/commandline/CommandLineHandlerClient.ModeCommand.html#ModeCommand--">ModeCommand()</a></span> - Constructor for class client.commandline.<a href="client/commandline/CommandLineHandlerClient.ModeCommand.html" title="class in client.commandline">CommandLineHandlerClient.ModeCommand</a></dt>
-<dd>&nbsp;</dd>
 </dl>
 <a name="I:P">
 <!--   -->
@@ -248,8 +244,6 @@
 <dl>
 <dt><span class="memberNameLink"><a href="client/commandline/CommandLineHandlerClient.ConnectionCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class client.commandline.<a href="client/commandline/CommandLineHandlerClient.ConnectionCommand.html" title="class in client.commandline">CommandLineHandlerClient.ConnectionCommand</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="client/commandline/CommandLineHandlerClient.ModeCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class client.commandline.<a href="client/commandline/CommandLineHandlerClient.ModeCommand.html" title="class in client.commandline">CommandLineHandlerClient.ModeCommand</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/commandline/pdcommands/AddCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class client.commandline.pdcommands.<a href="client/commandline/pdcommands/AddCommand.html" title="class in client.commandline.pdcommands">AddCommand</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="client/commandline/pdcommands/AddIfMaxCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class client.commandline.pdcommands.<a href="client/commandline/pdcommands/AddIfMaxCommand.html" title="class in client.commandline.pdcommands">AddIfMaxCommand</a></dt>
diff --git a/Lab5Client/build/docs/javadoc/index.html b/Lab5Client/build/docs/javadoc/index.html
index 23ee3c9..641a74d 100644
--- a/Lab5Client/build/docs/javadoc/index.html
+++ b/Lab5Client/build/docs/javadoc/index.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Client 2.2 API</title>
+<title>Lab5Client 3.0 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/Lab5Client/build/docs/javadoc/overview-frame.html b/Lab5Client/build/docs/javadoc/overview-frame.html
index 1e3883a..0c1efa6 100644
--- a/Lab5Client/build/docs/javadoc/overview-frame.html
+++ b/Lab5Client/build/docs/javadoc/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (Lab5Client 2.2 API)</title>
+<title>Overview List (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Client/build/docs/javadoc/overview-summary.html b/Lab5Client/build/docs/javadoc/overview-summary.html
index bdfcb28..4716597 100644
--- a/Lab5Client/build/docs/javadoc/overview-summary.html
+++ b/Lab5Client/build/docs/javadoc/overview-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview (Lab5Client 2.2 API)</title>
+<title>Overview (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (Lab5Client 2.2 API)";
+            parent.document.title="Overview (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Lab5Client 2.2 API</h1>
+<h1 class="title">Lab5Client 3.0 API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
diff --git a/Lab5Client/build/docs/javadoc/overview-tree.html b/Lab5Client/build/docs/javadoc/overview-tree.html
index b285ddd..787e7db 100644
--- a/Lab5Client/build/docs/javadoc/overview-tree.html
+++ b/Lab5Client/build/docs/javadoc/overview-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Class Hierarchy (Lab5Client 2.2 API)</title>
+<title>Class Hierarchy (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (Lab5Client 2.2 API)";
+            parent.document.title="Class Hierarchy (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
@@ -85,7 +85,6 @@
 <li type="circle">common.commandline.Command (implements java.io.Serializable)
 <ul>
 <li type="circle">client.commandline.<a href="client/commandline/CommandLineHandlerClient.ConnectionCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandlerClient.ConnectionCommand</span></a></li>
-<li type="circle">client.commandline.<a href="client/commandline/CommandLineHandlerClient.ModeCommand.html" title="class in client.commandline"><span class="typeNameLink">CommandLineHandlerClient.ModeCommand</span></a></li>
 <li type="circle">common.commandline.pdcommands.PeopleDatabaseCommand
 <ul>
 <li type="circle">client.commandline.pdcommands.<a href="client/commandline/pdcommands/AddCommand.html" title="class in client.commandline.pdcommands"><span class="typeNameLink">AddCommand</span></a></li>
diff --git a/Lab5Client/build/docs/javadoc/serialized-form.html b/Lab5Client/build/docs/javadoc/serialized-form.html
index 29233de..9c867a0 100644
--- a/Lab5Client/build/docs/javadoc/serialized-form.html
+++ b/Lab5Client/build/docs/javadoc/serialized-form.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Serialized Form (Lab5Client 2.2 API)</title>
+<title>Serialized Form (Lab5Client 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (Lab5Client 2.2 API)";
+            parent.document.title="Serialized Form (Lab5Client 3.0 API)";
         }
     }
     catch(err) {
@@ -80,11 +80,6 @@
 </a>
 <h3>Class <a href="client/commandline/CommandLineHandlerClient.ConnectionCommand.html" title="class in client.commandline">client.commandline.CommandLineHandlerClient.ConnectionCommand</a> extends common.commandline.Command implements Serializable</h3>
 </li>
-<li class="blockList"><a name="client.commandline.CommandLineHandlerClient.ModeCommand">
-<!--   -->
-</a>
-<h3>Class <a href="client/commandline/CommandLineHandlerClient.ModeCommand.html" title="class in client.commandline">client.commandline.CommandLineHandlerClient.ModeCommand</a> extends common.commandline.Command implements Serializable</h3>
-</li>
 </ul>
 </li>
 <li class="blockList">
diff --git a/Lab5Client/build/libs/Lab5Client-2.2.jar b/Lab5Client/build/libs/Lab5Client-2.2.jar
new file mode 100644
index 0000000..eb51353
Binary files /dev/null and b/Lab5Client/build/libs/Lab5Client-2.2.jar differ
diff --git a/Lab5Client/build/libs/Lab5Client-3.0.jar b/Lab5Client/build/libs/Lab5Client-3.0.jar
new file mode 100644
index 0000000..d65e765
Binary files /dev/null and b/Lab5Client/build/libs/Lab5Client-3.0.jar differ
diff --git a/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin
index e376eb7..16f777a 100644
Binary files a/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Client/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/Lab5Client/build/tmp/javadoc/javadoc.options b/Lab5Client/build/tmp/javadoc/javadoc.options
index 98528cf..7eb1199 100644
--- a/Lab5Client/build/tmp/javadoc/javadoc.options
+++ b/Lab5Client/build/tmp/javadoc/javadoc.options
@@ -1,10 +1,10 @@
--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-2.2.jar'
+-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 2.2 API'
+-doctitle 'Lab5Client 3.0 API'
 -encoding 'UTF-8'
 -notimestamp 
 -quiet 
--windowtitle 'Lab5Client 2.2 API'
+-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\\commandline\\pdcommands\\AddCommand.java'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Client\\src\\main\\java\\client\\commandline\\pdcommands\\AddIfMaxCommand.java'
diff --git a/Lab5Client/src/main/java/client/Lab5Client.java b/Lab5Client/src/main/java/client/Lab5Client.java
index 662f15a..ffcf8bd 100644
--- a/Lab5Client/src/main/java/client/Lab5Client.java
+++ b/Lab5Client/src/main/java/client/Lab5Client.java
@@ -2,9 +2,6 @@ package client;
 
 import client.commandline.CommandLineHandlerClient;
 import common.commandline.CommandLineHandler;
-import common.commandline.pdcommands.PeopleDatabaseCommands;
-import common.collection.Database;
-import common.collection.PeopleDatabase;
 import common.util.UtilFunctions;
 
 import java.util.logging.Logger;
@@ -15,16 +12,6 @@ public class Lab5Client {
 
     public static void main(String[] args) {
         CommandLineHandler cmd = CommandLineHandlerClient.getClientCommandLine();
-
-        PeopleDatabase peopleDatabase = new PeopleDatabase(LOGGER);
-        try {
-            peopleDatabase.load();
-        } catch (Database.DatabaseLoadFailedException e) {
-            System.out.println(e.getMessage());
-            System.exit(-1);
-        }
-        PeopleDatabaseCommands.peopleDatabase = peopleDatabase;
-
         cmd.start();
     }
 }
diff --git a/Lab5Client/src/main/java/client/commandline/CommandLineHandlerClient.java b/Lab5Client/src/main/java/client/commandline/CommandLineHandlerClient.java
index ba8d95a..347cef1 100644
--- a/Lab5Client/src/main/java/client/commandline/CommandLineHandlerClient.java
+++ b/Lab5Client/src/main/java/client/commandline/CommandLineHandlerClient.java
@@ -8,7 +8,7 @@ import common.commandline.CommandRegistry;
 import common.commandline.response.CommandResult;
 import common.commandline.response.DefaultResponse;
 import common.commandline.response.Response;
-import common.parser.ConnectionProperties;
+import common.net.ConnectionProperties;
 import common.util.UtilFunctions;
 
 import java.io.*;
@@ -16,12 +16,11 @@ import java.util.Locale;
 
 public final class CommandLineHandlerClient extends CommandLineHandler {
 
-    private boolean clientMode = true;
     private final UDPClient udp = new UDPClient(ConnectionProperties.getHostname(), ConnectionProperties.getPort());
 
     private CommandLineHandlerClient() {
         super();
-        CommandRegistry.registerCommands(new ModeCommand(), new ConnectionCommand(), new InfoCommand(), new ShowCommand(), new AddCommand(), new AddIfMaxCommand(),
+        CommandRegistry.registerCommands(new ConnectionCommand(), new InfoCommand(), new ShowCommand(), new AddCommand(), new AddIfMaxCommand(),
                 new AddIfMinCommand(), new ClearCommand(), new FilterContainsNameCommand(), new PrintFieldDescendingLocationCommand(),
                 new RemoveByIdCommand(), new SumOfHeightCommand(), new UpdateCommand());
     }
@@ -39,8 +38,7 @@ public final class CommandLineHandlerClient extends CommandLineHandler {
         }
         boolean argsValid = command.validate(args);
         if (!argsValid) return;
-        boolean isClient = command.isClientOnly() || clientMode;
-        CommandResult result = isClient ? command.executeOnClient() : executeOnServer(udp, command);
+        CommandResult result = command.isClientOnly() ? command.executeOnClient() : executeOnServer(udp, command);
         PrintStream ps = result.getResponse() == DefaultResponse.OK ? System.out : System.err;
         ps.println(result.getValue());
         updateHistory(alias);
@@ -50,40 +48,6 @@ public final class CommandLineHandlerClient extends CommandLineHandler {
         return udp.send(command.getExecutable(), command.getArgs());
     }
 
-    public class ModeCommand extends Command {
-        public ModeCommand() {
-            super("mode", true, "mode [sw] : выводит режим работы программы, если написать sw, меняет режим с серверного на клиентский или наоборот");
-            this.executable = args -> {
-                String result;
-                if (args.length == 0) {
-                    result = "Программа работает в режиме клиент " + (clientMode ? "" : "+ сервер");
-                } else {
-                    if (clientMode) {
-                        result = "Режим работы сменен на клиент + сервер";
-                        udp.connect();
-                        if (!udp.isAvailable()) {
-                            udp.disconnect();
-                            clientMode = true;
-                            return new CommandResult("Не удалось установить соединение с сервером", DefaultResponse.SERVER_ERROR);
-                        } else clientMode = false;
-                    } else {
-                        result = "Режим работы сменен на клиент";
-                        udp.disconnect();
-                        clientMode = true;
-                    }
-                }
-                return new CommandResult(result, DefaultResponse.OK);
-            };
-        }
-
-        @Override
-        public boolean validate(String[] args) {
-            if (args.length > 0 && args[0].equals("sw")) this.args = args;
-            else this.args = new Object[]{};
-            return true;
-        }
-    }
-
     public class ConnectionCommand extends Command {
         public ConnectionCommand() {
             super("con", true, "con [host|port] [value] : выводит информацию о сохраненных данных соединения с сервером, можно менять адрес или порт написав host или port и после них соответствующее значение");
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/AddCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/AddCommand.java
index 9e510e7..2d9a62e 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/AddCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/AddCommand.java
@@ -7,7 +7,7 @@ import common.commandline.pdcommands.PeopleDatabaseCommands;
 public class AddCommand extends PeopleDatabaseCommand {
     public AddCommand() {
         super("add", false, "add <Person> : добавить новый элемент в коллекцию",
-                Executables.ADD.getExecutable());
+                Executables.ADD.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/AddIfMaxCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/AddIfMaxCommand.java
index 9edfd8d..300cc3f 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/AddIfMaxCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/AddIfMaxCommand.java
@@ -7,7 +7,7 @@ import common.commandline.pdcommands.PeopleDatabaseCommands;
 public class AddIfMaxCommand extends PeopleDatabaseCommand {
     public AddIfMaxCommand() {
         super("add_if_max", false, "add_if_max <Person> : добавить новый элемент в коллекцию, если его значение превышает значение наибольшего элемента этой коллекции",
-                Executables.ADD_IF_MAX.getExecutable());
+                Executables.ADD_IF_MAX.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/AddIfMinCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/AddIfMinCommand.java
index 0c57b4b..f07de91 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/AddIfMinCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/AddIfMinCommand.java
@@ -7,7 +7,7 @@ import common.commandline.pdcommands.PeopleDatabaseCommands;
 public class AddIfMinCommand extends PeopleDatabaseCommand {
     public AddIfMinCommand() {
         super("add_if_min", false, "add_if_min <Person> : добавить новый элемент в коллекцию, если его значение меньше, чем у наименьшего элемента этой коллекции",
-                Executables.ADD_IF_MIN.getExecutable());
+                Executables.ADD_IF_MIN.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/ClearCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/ClearCommand.java
index 5483031..ddb57ca 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/ClearCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/ClearCommand.java
@@ -6,7 +6,7 @@ import common.commandline.pdcommands.PeopleDatabaseCommand;
 public class ClearCommand extends PeopleDatabaseCommand {
     public ClearCommand() {
         super("clear", false, "clear : очистить коллекцию",
-                Executables.CLEAR.getExecutable());
+                Executables.CLEAR.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/FilterContainsNameCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/FilterContainsNameCommand.java
index aba049f..e80381b 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/FilterContainsNameCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/FilterContainsNameCommand.java
@@ -6,7 +6,7 @@ import common.commandline.pdcommands.PeopleDatabaseCommand;
 public class FilterContainsNameCommand extends PeopleDatabaseCommand {
     public FilterContainsNameCommand() {
         super("filter_contains_name", false, "filter_contains_name {name} : вывести элементы, значение поля name которых содержит заданную подстроку",
-                Executables.FILTER_CONTAINS_NAME.getExecutable());
+                Executables.FILTER_CONTAINS_NAME.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/InfoCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/InfoCommand.java
index 3685782..cdbfdc9 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/InfoCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/InfoCommand.java
@@ -6,7 +6,7 @@ import common.commandline.pdcommands.PeopleDatabaseCommand;
 public class InfoCommand extends PeopleDatabaseCommand {
     public InfoCommand() {
         super("info", false, "info : вывести в стандартный поток вывода информацию о коллекции (тип, дата инициализации, количество элементов и т.д.)",
-                Executables.INFO.getExecutable());
+                Executables.INFO.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.java
index 073ddda..2529d6e 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/PrintFieldDescendingLocationCommand.java
@@ -6,7 +6,7 @@ import common.commandline.pdcommands.PeopleDatabaseCommand;
 public class PrintFieldDescendingLocationCommand extends PeopleDatabaseCommand {
     public PrintFieldDescendingLocationCommand() {
         super("print_field_descending_location", false, "print_field_descending_location : вывести значения поля location всех элементов в порядке убывания",
-                Executables.PRINT_FIELD_DESCENDING_LOCATION.getExecutable());
+                Executables.PRINT_FIELD_DESCENDING_LOCATION.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/RemoveByIdCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/RemoveByIdCommand.java
index 8662964..7d6491c 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/RemoveByIdCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/RemoveByIdCommand.java
@@ -7,7 +7,7 @@ import common.util.UtilFunctions;
 public class RemoveByIdCommand extends PeopleDatabaseCommand {
     public RemoveByIdCommand() {
         super("remove_by_id", false, "remove_by_id {id} : удалить элемент из коллекции по его {id}",
-                Executables.REMOVE_BY_ID.getExecutable());
+                Executables.REMOVE_BY_ID.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/ShowCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/ShowCommand.java
index 045468f..67d55f5 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/ShowCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/ShowCommand.java
@@ -6,7 +6,7 @@ import common.commandline.pdcommands.PeopleDatabaseCommand;
 public class ShowCommand extends PeopleDatabaseCommand {
     public ShowCommand() {
         super("show", false, "show : вывести в стандартный поток вывода все элементы коллекции в строковом представлении",
-                Executables.SHOW.getExecutable());
+                Executables.SHOW.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/SumOfHeightCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/SumOfHeightCommand.java
index f2c4212..7334818 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/SumOfHeightCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/SumOfHeightCommand.java
@@ -6,7 +6,7 @@ import common.commandline.pdcommands.PeopleDatabaseCommand;
 public class SumOfHeightCommand extends PeopleDatabaseCommand {
     public SumOfHeightCommand() {
         super("sum_of_height", false, "sum_of_height : вывести сумму значений поля height для всех элементов коллекции",
-                Executables.SUM_OF_HEIGHT.getExecutable());
+                Executables.SUM_OF_HEIGHT.executable);
     }
 
     @Override
diff --git a/Lab5Client/src/main/java/client/commandline/pdcommands/UpdateCommand.java b/Lab5Client/src/main/java/client/commandline/pdcommands/UpdateCommand.java
index a27c692..048f486 100644
--- a/Lab5Client/src/main/java/client/commandline/pdcommands/UpdateCommand.java
+++ b/Lab5Client/src/main/java/client/commandline/pdcommands/UpdateCommand.java
@@ -8,7 +8,7 @@ import common.util.UtilFunctions;
 public class UpdateCommand extends PeopleDatabaseCommand {
     public UpdateCommand() {
         super("update", false, "update {id} <Person> : обновить значение элемента коллекции, {id} которого равен заданному",
-                Executables.UPDATE.getExecutable());
+                Executables.UPDATE.executable);
     }
 
     @Override
diff --git a/Lab5Core/build.gradle.kts b/Lab5Core/build.gradle.kts
index 085c52e..2abe0e5 100644
--- a/Lab5Core/build.gradle.kts
+++ b/Lab5Core/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "ru.erius.lab5"
-version = "2.2"
+version = "3.0"
 
 repositories {
     mavenCentral()
diff --git a/Lab5Core/build/classes/java/main/common/collection/Database$DatabaseLoadFailedException.class b/Lab5Core/build/classes/java/main/common/collection/Database$DatabaseLoadFailedException.class
deleted file mode 100644
index 492ba0a..0000000
Binary files a/Lab5Core/build/classes/java/main/common/collection/Database$DatabaseLoadFailedException.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/collection/Database$DatabaseSaveFailedException.class b/Lab5Core/build/classes/java/main/common/collection/Database$DatabaseSaveFailedException.class
deleted file mode 100644
index c8f1fe3..0000000
Binary files a/Lab5Core/build/classes/java/main/common/collection/Database$DatabaseSaveFailedException.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/collection/Database.class b/Lab5Core/build/classes/java/main/common/collection/Database.class
deleted file mode 100644
index 8603206..0000000
Binary files a/Lab5Core/build/classes/java/main/common/collection/Database.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/collection/PeopleDatabase.class b/Lab5Core/build/classes/java/main/common/collection/PeopleDatabase.class
index 946242d..498f46b 100644
Binary files a/Lab5Core/build/classes/java/main/common/collection/PeopleDatabase.class and b/Lab5Core/build/classes/java/main/common/collection/PeopleDatabase.class differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/Command.class b/Lab5Core/build/classes/java/main/common/commandline/Command.class
new file mode 100644
index 0000000..58192fa
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/Command.class 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
new file mode 100644
index 0000000..7639fe2
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$CommandLineNotInitialized.class 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
new file mode 100644
index 0000000..946f5ec
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$ExecuteScriptCommand.class 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
new file mode 100644
index 0000000..a34e7f1
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$ExitCommand.class 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
new file mode 100644
index 0000000..f7b6201
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler$HistoryCommand.class differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler.class b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler.class
new file mode 100644
index 0000000..b0acb0c
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandLineHandler.class 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
new file mode 100644
index 0000000..3ebeaae
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$1.class 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
new file mode 100644
index 0000000..6fd9b56
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$CommandAlreadyExistsException.class 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
new file mode 100644
index 0000000..254c900
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$CommandNotFoundException.class 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
new file mode 100644
index 0000000..7a86754
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry$HelpCommand.class differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry.class b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry.class
new file mode 100644
index 0000000..cab51c2
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/CommandRegistry.class differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/Executables.class b/Lab5Core/build/classes/java/main/common/commandline/Executables.class
index fa60598..847f799 100644
Binary files a/Lab5Core/build/classes/java/main/common/commandline/Executables.class and b/Lab5Core/build/classes/java/main/common/commandline/Executables.class differ
diff --git a/Lab5Core/build/classes/java/main/common/commandline/LongStrings.class b/Lab5Core/build/classes/java/main/common/commandline/LongStrings.class
new file mode 100644
index 0000000..9325f45
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/LongStrings.class 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
new file mode 100644
index 0000000..d5f1bbc
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/pdcommands/PeopleDatabaseCommand.class 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
new file mode 100644
index 0000000..dc9ca83
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/commandline/pdcommands/PeopleDatabaseCommands.class differ
diff --git a/Lab5Core/build/classes/java/main/common/data/Coordinates.class b/Lab5Core/build/classes/java/main/common/data/Coordinates.class
index 95a2996..274b4f0 100644
Binary files a/Lab5Core/build/classes/java/main/common/data/Coordinates.class and b/Lab5Core/build/classes/java/main/common/data/Coordinates.class differ
diff --git a/Lab5Core/build/classes/java/main/common/data/Location.class b/Lab5Core/build/classes/java/main/common/data/Location.class
index 69aefe6..0327b7c 100644
Binary files a/Lab5Core/build/classes/java/main/common/data/Location.class and b/Lab5Core/build/classes/java/main/common/data/Location.class differ
diff --git a/Lab5Core/build/classes/java/main/common/data/Person.class b/Lab5Core/build/classes/java/main/common/data/Person.class
index 39516c3..617a841 100644
Binary files a/Lab5Core/build/classes/java/main/common/data/Person.class and b/Lab5Core/build/classes/java/main/common/data/Person.class differ
diff --git a/Lab5Core/build/classes/java/main/common/net/ConnectionProperties.class b/Lab5Core/build/classes/java/main/common/net/ConnectionProperties.class
new file mode 100644
index 0000000..a3407ad
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/net/ConnectionProperties.class differ
diff --git a/Lab5Core/build/classes/java/main/common/parser/Adapters$ColorAdapter.class b/Lab5Core/build/classes/java/main/common/parser/Adapters$ColorAdapter.class
deleted file mode 100644
index c627f25..0000000
Binary files a/Lab5Core/build/classes/java/main/common/parser/Adapters$ColorAdapter.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/parser/Adapters$CoordinateYAdapter.class b/Lab5Core/build/classes/java/main/common/parser/Adapters$CoordinateYAdapter.class
deleted file mode 100644
index 5a2dea9..0000000
Binary files a/Lab5Core/build/classes/java/main/common/parser/Adapters$CoordinateYAdapter.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/parser/Adapters$CountryAdapter.class b/Lab5Core/build/classes/java/main/common/parser/Adapters$CountryAdapter.class
deleted file mode 100644
index a585e91..0000000
Binary files a/Lab5Core/build/classes/java/main/common/parser/Adapters$CountryAdapter.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/parser/Adapters$HeightAdapter.class b/Lab5Core/build/classes/java/main/common/parser/Adapters$HeightAdapter.class
deleted file mode 100644
index 4fec1a6..0000000
Binary files a/Lab5Core/build/classes/java/main/common/parser/Adapters$HeightAdapter.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/parser/Adapters$LocalDateAdapter.class b/Lab5Core/build/classes/java/main/common/parser/Adapters$LocalDateAdapter.class
deleted file mode 100644
index 8d44bb9..0000000
Binary files a/Lab5Core/build/classes/java/main/common/parser/Adapters$LocalDateAdapter.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/parser/Adapters$NameAdapter.class b/Lab5Core/build/classes/java/main/common/parser/Adapters$NameAdapter.class
deleted file mode 100644
index c39718b..0000000
Binary files a/Lab5Core/build/classes/java/main/common/parser/Adapters$NameAdapter.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/parser/Adapters$PassportAdapter.class b/Lab5Core/build/classes/java/main/common/parser/Adapters$PassportAdapter.class
deleted file mode 100644
index 0e049b7..0000000
Binary files a/Lab5Core/build/classes/java/main/common/parser/Adapters$PassportAdapter.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/parser/Adapters.class b/Lab5Core/build/classes/java/main/common/parser/Adapters.class
deleted file mode 100644
index 9c88fc4..0000000
Binary files a/Lab5Core/build/classes/java/main/common/parser/Adapters.class and /dev/null differ
diff --git a/Lab5Core/build/classes/java/main/common/parser/ConnectionProperties.class b/Lab5Core/build/classes/java/main/common/parser/ConnectionProperties.class
deleted file mode 100644
index c9b1f6c..0000000
Binary files a/Lab5Core/build/classes/java/main/common/parser/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
new file mode 100644
index 0000000..a22eaa6
Binary files /dev/null and b/Lab5Core/build/classes/java/main/common/util/UtilFunctions$1.class differ
diff --git a/Lab5Core/build/docs/javadoc/allclasses-frame.html b/Lab5Core/build/docs/javadoc/allclasses-frame.html
index ab95041..9114f5e 100644
--- a/Lab5Core/build/docs/javadoc/allclasses-frame.html
+++ b/Lab5Core/build/docs/javadoc/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Core 2.2 API)</title>
+<title>All Classes (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,14 +11,6 @@
 <h1 class="bar">All&nbsp;Classes</h1>
 <div class="indexContainer">
 <ul>
-<li><a href="common/parser/Adapters.html" title="class in common.parser" target="classFrame">Adapters</a></li>
-<li><a href="common/parser/Adapters.ColorAdapter.html" title="class in common.parser" target="classFrame">Adapters.ColorAdapter</a></li>
-<li><a href="common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser" target="classFrame">Adapters.CoordinateYAdapter</a></li>
-<li><a href="common/parser/Adapters.CountryAdapter.html" title="class in common.parser" target="classFrame">Adapters.CountryAdapter</a></li>
-<li><a href="common/parser/Adapters.HeightAdapter.html" title="class in common.parser" target="classFrame">Adapters.HeightAdapter</a></li>
-<li><a href="common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser" target="classFrame">Adapters.LocalDateAdapter</a></li>
-<li><a href="common/parser/Adapters.NameAdapter.html" title="class in common.parser" target="classFrame">Adapters.NameAdapter</a></li>
-<li><a href="common/parser/Adapters.PassportAdapter.html" title="class in common.parser" target="classFrame">Adapters.PassportAdapter</a></li>
 <li><a href="common/data/Color.html" title="enum in common.data" target="classFrame">Color</a></li>
 <li><a href="common/commandline/Command.html" title="class in common.commandline" target="classFrame">Command</a></li>
 <li><a href="common/commandline/CommandLineHandler.html" title="class in common.commandline" target="classFrame">CommandLineHandler</a></li>
@@ -28,12 +20,9 @@
 <li><a href="common/commandline/CommandRegistry.CommandNotFoundException.html" title="class in common.commandline" target="classFrame">CommandRegistry.CommandNotFoundException</a></li>
 <li><a href="common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline" target="classFrame">CommandRegistry.HelpCommand</a></li>
 <li><a href="common/commandline/response/CommandResult.html" title="class in common.commandline.response" target="classFrame">CommandResult</a></li>
-<li><a href="common/parser/ConnectionProperties.html" title="class in common.parser" target="classFrame">ConnectionProperties</a></li>
+<li><a href="common/net/ConnectionProperties.html" title="class in common.net" target="classFrame">ConnectionProperties</a></li>
 <li><a href="common/data/Coordinates.html" title="class in common.data" target="classFrame">Coordinates</a></li>
 <li><a href="common/data/Country.html" title="enum in common.data" target="classFrame">Country</a></li>
-<li><a href="common/collection/Database.html" title="interface in common.collection" target="classFrame"><span class="interfaceName">Database</span></a></li>
-<li><a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection" target="classFrame">Database.DatabaseLoadFailedException</a></li>
-<li><a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection" target="classFrame">Database.DatabaseSaveFailedException</a></li>
 <li><a href="common/commandline/response/DefaultResponse.html" title="enum in common.commandline.response" target="classFrame">DefaultResponse</a></li>
 <li><a href="common/commandline/Executable.html" title="interface in common.commandline" target="classFrame"><span class="interfaceName">Executable</span></a></li>
 <li><a href="common/commandline/Executables.html" title="enum in common.commandline" target="classFrame">Executables</a></li>
diff --git a/Lab5Core/build/docs/javadoc/allclasses-noframe.html b/Lab5Core/build/docs/javadoc/allclasses-noframe.html
index a526f3d..e89bfbd 100644
--- a/Lab5Core/build/docs/javadoc/allclasses-noframe.html
+++ b/Lab5Core/build/docs/javadoc/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Core 2.2 API)</title>
+<title>All Classes (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,14 +11,6 @@
 <h1 class="bar">All&nbsp;Classes</h1>
 <div class="indexContainer">
 <ul>
-<li><a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></li>
-<li><a href="common/parser/Adapters.ColorAdapter.html" title="class in common.parser">Adapters.ColorAdapter</a></li>
-<li><a href="common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser">Adapters.CoordinateYAdapter</a></li>
-<li><a href="common/parser/Adapters.CountryAdapter.html" title="class in common.parser">Adapters.CountryAdapter</a></li>
-<li><a href="common/parser/Adapters.HeightAdapter.html" title="class in common.parser">Adapters.HeightAdapter</a></li>
-<li><a href="common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser">Adapters.LocalDateAdapter</a></li>
-<li><a href="common/parser/Adapters.NameAdapter.html" title="class in common.parser">Adapters.NameAdapter</a></li>
-<li><a href="common/parser/Adapters.PassportAdapter.html" title="class in common.parser">Adapters.PassportAdapter</a></li>
 <li><a href="common/data/Color.html" title="enum in common.data">Color</a></li>
 <li><a href="common/commandline/Command.html" title="class in common.commandline">Command</a></li>
 <li><a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></li>
@@ -28,12 +20,9 @@
 <li><a href="common/commandline/CommandRegistry.CommandNotFoundException.html" title="class in common.commandline">CommandRegistry.CommandNotFoundException</a></li>
 <li><a href="common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline">CommandRegistry.HelpCommand</a></li>
 <li><a href="common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a></li>
-<li><a href="common/parser/ConnectionProperties.html" title="class in common.parser">ConnectionProperties</a></li>
+<li><a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></li>
 <li><a href="common/data/Coordinates.html" title="class in common.data">Coordinates</a></li>
 <li><a href="common/data/Country.html" title="enum in common.data">Country</a></li>
-<li><a href="common/collection/Database.html" title="interface in common.collection"><span class="interfaceName">Database</span></a></li>
-<li><a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></li>
-<li><a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></li>
 <li><a href="common/commandline/response/DefaultResponse.html" title="enum in common.commandline.response">DefaultResponse</a></li>
 <li><a href="common/commandline/Executable.html" title="interface in common.commandline"><span class="interfaceName">Executable</span></a></li>
 <li><a href="common/commandline/Executables.html" title="enum in common.commandline">Executables</a></li>
diff --git a/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseSaveFailedException.html b/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseSaveFailedException.html
deleted file mode 100644
index c91e670..0000000
--- a/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseSaveFailedException.html
+++ /dev/null
@@ -1,319 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="ru">
-<head>
-<!-- Generated by javadoc -->
-<title>Database.DatabaseSaveFailedException (Lab5Core 2.2 API)</title>
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Database.DatabaseSaveFailedException (Lab5Core 2.2 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/collection/PeopleDatabase.html" title="class in common.collection"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?common/collection/Database.DatabaseSaveFailedException.html" target="_top">Frames</a></li>
-<li><a href="Database.DatabaseSaveFailedException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">common.collection</div>
-<h2 title="Class Database.DatabaseSaveFailedException" class="title">Class Database.DatabaseSaveFailedException</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>java.lang.Throwable</li>
-<li>
-<ul class="inheritance">
-<li>java.lang.Exception</li>
-<li>
-<ul class="inheritance">
-<li>common.collection.Database.DatabaseSaveFailedException</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.io.Serializable</dd>
-</dl>
-<dl>
-<dt>Enclosing interface:</dt>
-<dd><a href="../../common/collection/Database.html" title="interface in common.collection">Database</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public static class <span class="typeNameLabel">Database.DatabaseSaveFailedException</span>
-extends java.lang.Exception</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../serialized-form.html#common.collection.Database.DatabaseSaveFailedException">Serialized Form</a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.String-">DatabaseSaveFailedException</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.String-java.lang.String-">DatabaseSaveFailedException</a></span>(java.lang.String&nbsp;message,
-                           java.lang.String&nbsp;path)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.String-java.lang.String-java.lang.Throwable-">DatabaseSaveFailedException</a></span>(java.lang.String&nbsp;message,
-                           java.lang.String&nbsp;path,
-                           java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.String-java.lang.Throwable-">DatabaseSaveFailedException</a></span>(java.lang.String&nbsp;message,
-                           java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.Throwable-">DatabaseSaveFailedException</a></span>(java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
-<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="DatabaseSaveFailedException-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DatabaseSaveFailedException</h4>
-<pre>public&nbsp;DatabaseSaveFailedException(java.lang.String&nbsp;message)</pre>
-</li>
-</ul>
-<a name="DatabaseSaveFailedException-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DatabaseSaveFailedException</h4>
-<pre>public&nbsp;DatabaseSaveFailedException(java.lang.String&nbsp;message,
-                                   java.lang.String&nbsp;path)</pre>
-</li>
-</ul>
-<a name="DatabaseSaveFailedException-java.lang.String-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DatabaseSaveFailedException</h4>
-<pre>public&nbsp;DatabaseSaveFailedException(java.lang.String&nbsp;message,
-                                   java.lang.Throwable&nbsp;cause)</pre>
-</li>
-</ul>
-<a name="DatabaseSaveFailedException-java.lang.String-java.lang.String-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DatabaseSaveFailedException</h4>
-<pre>public&nbsp;DatabaseSaveFailedException(java.lang.String&nbsp;message,
-                                   java.lang.String&nbsp;path,
-                                   java.lang.Throwable&nbsp;cause)</pre>
-</li>
-</ul>
-<a name="DatabaseSaveFailedException-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>DatabaseSaveFailedException</h4>
-<pre>public&nbsp;DatabaseSaveFailedException(java.lang.Throwable&nbsp;cause)</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/collection/PeopleDatabase.html" title="class in common.collection"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?common/collection/Database.DatabaseSaveFailedException.html" target="_top">Frames</a></li>
-<li><a href="Database.DatabaseSaveFailedException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/Lab5Core/build/docs/javadoc/common/collection/Database.html b/Lab5Core/build/docs/javadoc/common/collection/Database.html
deleted file mode 100644
index f804d4c..0000000
--- a/Lab5Core/build/docs/javadoc/common/collection/Database.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="ru">
-<head>
-<!-- Generated by javadoc -->
-<title>Database (Lab5Core 2.2 API)</title>
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Database (Lab5Core 2.2 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?common/collection/Database.html" target="_top">Frames</a></li>
-<li><a href="Database.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">common.collection</div>
-<h2 title="Interface Database" class="title">Interface Database</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../../common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">Database</span></pre>
-<div class="block">Интерфейс баз данных с методами <a href="../../common/collection/Database.html#load--"><code>load()</code></a> и <a href="../../common/collection/Database.html#save--"><code>save()</code></a></div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
-<!--   -->
-</a>
-<h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
-<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Interface and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></span></code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/collection/Database.html#load--">load</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/collection/Database.html#save--">save</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="load--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>load</h4>
-<pre>void&nbsp;load()
-   throws <a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="save--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>save</h4>
-<pre>void&nbsp;save()
-   throws <a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?common/collection/Database.html" target="_top">Frames</a></li>
-<li><a href="Database.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/Lab5Core/build/docs/javadoc/common/collection/PeopleDatabase.html b/Lab5Core/build/docs/javadoc/common/collection/PeopleDatabase.html
index 2e8c4a3..99c9fcb 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/PeopleDatabase.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/PeopleDatabase.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>PeopleDatabase (Lab5Core 2.2 API)</title>
+<title>PeopleDatabase (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PeopleDatabase (Lab5Core 2.2 API)";
+            parent.document.title="PeopleDatabase (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var methods = {"i0":10,"i1":10,"i2":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
@@ -105,41 +105,16 @@ var activeTableTab = "activeTableTab";
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd><a href="../../common/collection/Database.html" title="interface in common.collection">Database</a></dd>
-</dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">PeopleDatabase</span>
-extends java.lang.Object
-implements <a href="../../common/collection/Database.html" title="interface in common.collection">Database</a></pre>
-<div class="block">Класс базы данных людей, реализующий интерфейс Database</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../common/collection/Database.html" title="interface in common.collection"><code>Database</code></a></dd>
-</dl>
+extends java.lang.Object</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
-<!--   -->
-</a>
-<h3>Nested Class Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.common.collection.Database">
-<!--   -->
-</a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;common.collection.<a href="../../common/collection/Database.html" title="interface in common.collection">Database</a></h3>
-<code><a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a>, <a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></code></li>
-</ul>
-</li>
-</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -152,7 +127,7 @@ implements <a href="../../common/collection/Database.html" title="interface in c
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/PeopleDatabase.html#PeopleDatabase-java.util.logging.Logger-">PeopleDatabase</a></span>(java.util.logging.Logger&nbsp;logger)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/PeopleDatabase.html#PeopleDatabase--">PeopleDatabase</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -175,19 +150,11 @@ implements <a href="../../common/collection/Database.html" title="interface in c
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/collection/PeopleDatabase.html#load--">load</a></span>()</code>
-<div class="block">Метод, инициализирующий базу данных из файла, находящемся по пути, указанном в
- переменной окружения <a href="../../common/collection/PeopleDatabase.html#ENV_VAR"><code>ENV_VAR</code></a></div>
-</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/collection/PeopleDatabase.html#initFromDatabase-java.lang.String-java.lang.String-java.lang.String-">initFromDatabase</a></span>(java.lang.String&nbsp;url,
+                java.lang.String&nbsp;login,
+                java.lang.String&nbsp;password)</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/collection/PeopleDatabase.html#save--">save</a></span>()</code>
-<div class="block">Метод, сохраняющий базу данных в файл, находящемся по пути, указанном в
- переменной окружения <a href="../../common/collection/PeopleDatabase.html#ENV_VAR"><code>ENV_VAR</code></a></div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../common/collection/PeopleDatabase.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
@@ -213,13 +180,13 @@ implements <a href="../../common/collection/Database.html" title="interface in c
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="PeopleDatabase-java.util.logging.Logger-">
+<a name="PeopleDatabase--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>PeopleDatabase</h4>
-<pre>public&nbsp;PeopleDatabase(java.util.logging.Logger&nbsp;logger)</pre>
+<pre>public&nbsp;PeopleDatabase()</pre>
 </li>
 </ul>
 </li>
@@ -239,43 +206,15 @@ implements <a href="../../common/collection/Database.html" title="interface in c
 <pre>public&nbsp;java.lang.String&nbsp;info()</pre>
 </li>
 </ul>
-<a name="load--">
+<a name="initFromDatabase-java.lang.String-java.lang.String-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>load</h4>
-<pre>public&nbsp;void&nbsp;load()
-          throws <a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></pre>
-<div class="block">Метод, инициализирующий базу данных из файла, находящемся по пути, указанном в
- переменной окружения <a href="../../common/collection/PeopleDatabase.html#ENV_VAR"><code>ENV_VAR</code></a></div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../common/collection/Database.html#load--">load</a></code>&nbsp;in interface&nbsp;<code><a href="../../common/collection/Database.html" title="interface in common.collection">Database</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></code> - если переменная окружения <a href="../../common/collection/PeopleDatabase.html#ENV_VAR"><code>ENV_VAR</code></a> не задана,
-                                              файла не существует, либо отсутствуют права на запись или чтение</dd>
-</dl>
-</li>
-</ul>
-<a name="save--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>save</h4>
-<pre>public&nbsp;void&nbsp;save()
-          throws <a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></pre>
-<div class="block">Метод, сохраняющий базу данных в файл, находящемся по пути, указанном в
- переменной окружения <a href="../../common/collection/PeopleDatabase.html#ENV_VAR"><code>ENV_VAR</code></a></div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../common/collection/Database.html#save--">save</a></code>&nbsp;in interface&nbsp;<code><a href="../../common/collection/Database.html" title="interface in common.collection">Database</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></code> - если переменная окружения <a href="../../common/collection/PeopleDatabase.html#ENV_VAR"><code>ENV_VAR</code></a> не задана,
-                                              файла не существует, либо отсутствуют права на запись или чтение, или если структура xml файла
-                                              была каким-либо образом нарушена</dd>
-</dl>
+<h4>initFromDatabase</h4>
+<pre>public&nbsp;void&nbsp;initFromDatabase(java.lang.String&nbsp;url,
+                             java.lang.String&nbsp;login,
+                             java.lang.String&nbsp;password)</pre>
 </li>
 </ul>
 <a name="toString--">
@@ -318,7 +257,7 @@ implements <a href="../../common/collection/Database.html" title="interface in c
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
diff --git a/Lab5Core/build/docs/javadoc/common/collection/package-frame.html b/Lab5Core/build/docs/javadoc/common/collection/package-frame.html
index 35be3a7..c51740b 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/package-frame.html
@@ -3,26 +3,17 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.collection (Lab5Core 2.2 API)</title>
+<title>common.collection (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
 <body>
 <h1 class="bar"><a href="../../common/collection/package-summary.html" target="classFrame">common.collection</a></h1>
 <div class="indexContainer">
-<h2 title="Interfaces">Interfaces</h2>
-<ul title="Interfaces">
-<li><a href="Database.html" title="interface in common.collection" target="classFrame"><span class="interfaceName">Database</span></a></li>
-</ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
 <li><a href="PeopleDatabase.html" title="class in common.collection" target="classFrame">PeopleDatabase</a></li>
 </ul>
-<h2 title="Exceptions">Exceptions</h2>
-<ul title="Exceptions">
-<li><a href="Database.DatabaseLoadFailedException.html" title="class in common.collection" target="classFrame">Database.DatabaseLoadFailedException</a></li>
-<li><a href="Database.DatabaseSaveFailedException.html" title="class in common.collection" target="classFrame">Database.DatabaseSaveFailedException</a></li>
-</ul>
 </div>
 </body>
 </html>
diff --git a/Lab5Core/build/docs/javadoc/common/collection/package-summary.html b/Lab5Core/build/docs/javadoc/common/collection/package-summary.html
index 5ad4975..80f826b 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.collection (Lab5Core 2.2 API)</title>
+<title>common.collection (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.collection (Lab5Core 2.2 API)";
+            parent.document.title="common.collection (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -73,23 +73,6 @@
 <div class="contentContainer">
 <ul class="blockList">
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
-<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Interface</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../../common/collection/Database.html" title="interface in common.collection">Database</a></td>
-<td class="colLast">
-<div class="block">Интерфейс баз данных с методами <a href="../../common/collection/Database.html#load--"><code>Database.load()</code></a> и <a href="../../common/collection/Database.html#save--"><code>Database.save()</code></a></div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
 <table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
 <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
@@ -99,27 +82,6 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><a href="../../common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></td>
-<td class="colLast">
-<div class="block">Класс базы данных людей, реализующий интерфейс Database</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
-<caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Exception</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>
diff --git a/Lab5Core/build/docs/javadoc/common/collection/package-tree.html b/Lab5Core/build/docs/javadoc/common/collection/package-tree.html
index cd4f05f..42c3a14 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/collection/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.collection Class Hierarchy (Lab5Core 2.2 API)</title>
+<title>common.collection Class Hierarchy (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.collection Class Hierarchy (Lab5Core 2.2 API)";
+            parent.document.title="common.collection Class Hierarchy (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -79,24 +79,10 @@
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">common.collection.<a href="../../common/collection/PeopleDatabase.html" title="class in common.collection"><span class="typeNameLink">PeopleDatabase</span></a> (implements common.collection.<a href="../../common/collection/Database.html" title="interface in common.collection">Database</a>)</li>
-<li type="circle">java.lang.Throwable (implements java.io.Serializable)
-<ul>
-<li type="circle">java.lang.Exception
-<ul>
-<li type="circle">common.collection.<a href="../../common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection"><span class="typeNameLink">Database.DatabaseLoadFailedException</span></a></li>
-<li type="circle">common.collection.<a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection"><span class="typeNameLink">Database.DatabaseSaveFailedException</span></a></li>
+<li type="circle">common.collection.<a href="../../common/collection/PeopleDatabase.html" title="class in common.collection"><span class="typeNameLink">PeopleDatabase</span></a></li>
 </ul>
 </li>
 </ul>
-</li>
-</ul>
-</li>
-</ul>
-<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
-<ul>
-<li type="circle">common.collection.<a href="../../common/collection/Database.html" title="interface in common.collection"><span class="typeNameLink">Database</span></a></li>
-</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/Command.html b/Lab5Core/build/docs/javadoc/common/commandline/Command.html
new file mode 100644
index 0000000..81f1245
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/Command.html
@@ -0,0 +1,404 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>Command (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Command (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/Command.html" target="_top">Frames</a></li>
+<li><a href="Command.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">common.commandline</div>
+<h2 title="Class Command" class="title">Class Command</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.Command</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../common/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in common.commandline">CommandLineHandler.ExecuteScriptCommand</a>, <a href="../../common/commandline/CommandLineHandler.ExitCommand.html" title="class in common.commandline">CommandLineHandler.ExitCommand</a>, <a href="../../common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline">CommandLineHandler.HistoryCommand</a>, <a href="../../common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline">CommandRegistry.HelpCommand</a>, <a href="../../common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands">PeopleDatabaseCommand</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">Command</span>
+extends java.lang.Object
+implements java.io.Serializable</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#common.commandline.Command">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Command.html#alias">alias</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected java.lang.Object[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Command.html#args">args</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Command.html#clientOnly">clientOnly</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Command.html#description">description</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected <a href="../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Command.html#executable">executable</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/Command.html#Command-java.lang.String-boolean-java.lang.String-">Command</a></span>(java.lang.String&nbsp;alias,
+       boolean&nbsp;clientOnly,
+       java.lang.String&nbsp;description)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/Command.html#Command-java.lang.String-boolean-java.lang.String-common.commandline.Executable-">Command</a></span>(java.lang.String&nbsp;alias,
+       boolean&nbsp;clientOnly,
+       java.lang.String&nbsp;description,
+       <a href="../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a>&nbsp;executable)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Command.html#executeOnClient--">executeOnClient</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>abstract boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Command.html#validate-java.lang.String:A-">validate</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="alias">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>alias</h4>
+<pre>protected final&nbsp;java.lang.String alias</pre>
+</li>
+</ul>
+<a name="description">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>description</h4>
+<pre>protected final&nbsp;java.lang.String description</pre>
+</li>
+</ul>
+<a name="clientOnly">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>clientOnly</h4>
+<pre>protected final&nbsp;boolean clientOnly</pre>
+</li>
+</ul>
+<a name="executable">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>executable</h4>
+<pre>protected&nbsp;<a href="../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a> executable</pre>
+</li>
+</ul>
+<a name="args">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>args</h4>
+<pre>protected&nbsp;java.lang.Object[] args</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="Command-java.lang.String-boolean-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Command</h4>
+<pre>public&nbsp;Command(java.lang.String&nbsp;alias,
+               boolean&nbsp;clientOnly,
+               java.lang.String&nbsp;description)</pre>
+</li>
+</ul>
+<a name="Command-java.lang.String-boolean-java.lang.String-common.commandline.Executable-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Command</h4>
+<pre>public&nbsp;Command(java.lang.String&nbsp;alias,
+               boolean&nbsp;clientOnly,
+               java.lang.String&nbsp;description,
+               <a href="../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a>&nbsp;executable)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="validate-java.lang.String:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>validate</h4>
+<pre>public abstract&nbsp;boolean&nbsp;validate(java.lang.String[]&nbsp;args)</pre>
+</li>
+</ul>
+<a name="executeOnClient--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>executeOnClient</h4>
+<pre>public&nbsp;<a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a>&nbsp;executeOnClient()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/Command.html" target="_top">Frames</a></li>
+<li><a href="Command.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseLoadFailedException.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.CommandLineNotInitialized.html
similarity index 57%
rename from Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseLoadFailedException.html
rename to Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.CommandLineNotInitialized.html
index f525260..0654da7 100644
--- a/Lab5Core/build/docs/javadoc/common/collection/Database.DatabaseLoadFailedException.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.CommandLineNotInitialized.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Database.DatabaseLoadFailedException (Lab5Core 2.2 API)</title>
+<title>CommandLineHandler.CommandLineNotInitialized (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Database.DatabaseLoadFailedException (Lab5Core 2.2 API)";
+            parent.document.title="CommandLineHandler.CommandLineNotInitialized (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -41,12 +41,12 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/collection/Database.html" title="interface in common.collection"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/collection/Database.DatabaseLoadFailedException.html" target="_top">Frames</a></li>
-<li><a href="Database.DatabaseLoadFailedException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandLineHandler.CommandLineNotInitialized.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.CommandLineNotInitialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -84,8 +84,8 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">common.collection</div>
-<h2 title="Class Database.DatabaseLoadFailedException" class="title">Class Database.DatabaseLoadFailedException</h2>
+<div class="subTitle">common.commandline</div>
+<h2 title="Class CommandLineHandler.CommandLineNotInitialized" class="title">Class CommandLineHandler.CommandLineNotInitialized</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -98,7 +98,12 @@
 <li>java.lang.Exception</li>
 <li>
 <ul class="inheritance">
-<li>common.collection.Database.DatabaseLoadFailedException</li>
+<li>java.lang.RuntimeException</li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.CommandLineHandler.CommandLineNotInitialized</li>
+</ul>
+</li>
 </ul>
 </li>
 </ul>
@@ -114,16 +119,16 @@
 <dd>java.io.Serializable</dd>
 </dl>
 <dl>
-<dt>Enclosing interface:</dt>
-<dd><a href="../../common/collection/Database.html" title="interface in common.collection">Database</a></dd>
+<dt>Enclosing class:</dt>
+<dd><a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">Database.DatabaseLoadFailedException</span>
-extends java.lang.Exception</pre>
+<pre>public static class <span class="typeNameLabel">CommandLineHandler.CommandLineNotInitialized</span>
+extends java.lang.RuntimeException</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../serialized-form.html#common.collection.Database.DatabaseLoadFailedException">Serialized Form</a></dd>
+<dd><a href="../../serialized-form.html#common.commandline.CommandLineHandler.CommandLineNotInitialized">Serialized Form</a></dd>
 </dl>
 </li>
 </ul>
@@ -143,23 +148,10 @@ extends java.lang.Exception</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.String-">DatabaseLoadFailedException</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.CommandLineNotInitialized.html#CommandLineNotInitialized--">CommandLineNotInitialized</a></span>()</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.String-java.lang.String-">DatabaseLoadFailedException</a></span>(java.lang.String&nbsp;message,
-                           java.lang.String&nbsp;path)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.String-java.lang.String-java.lang.Throwable-">DatabaseLoadFailedException</a></span>(java.lang.String&nbsp;message,
-                           java.lang.String&nbsp;path,
-                           java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.String-java.lang.Throwable-">DatabaseLoadFailedException</a></span>(java.lang.String&nbsp;message,
-                           java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.Throwable-">DatabaseLoadFailedException</a></span>(java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.CommandLineNotInitialized.html#CommandLineNotInitialized-java.lang.String-">CommandLineNotInitialized</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -198,53 +190,22 @@ extends java.lang.Exception</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DatabaseLoadFailedException-java.lang.String-">
+<a name="CommandLineNotInitialized--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>DatabaseLoadFailedException</h4>
-<pre>public&nbsp;DatabaseLoadFailedException(java.lang.String&nbsp;message)</pre>
+<h4>CommandLineNotInitialized</h4>
+<pre>public&nbsp;CommandLineNotInitialized()</pre>
 </li>
 </ul>
-<a name="DatabaseLoadFailedException-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DatabaseLoadFailedException</h4>
-<pre>public&nbsp;DatabaseLoadFailedException(java.lang.String&nbsp;message,
-                                   java.lang.String&nbsp;path)</pre>
-</li>
-</ul>
-<a name="DatabaseLoadFailedException-java.lang.String-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DatabaseLoadFailedException</h4>
-<pre>public&nbsp;DatabaseLoadFailedException(java.lang.String&nbsp;message,
-                                   java.lang.Throwable&nbsp;cause)</pre>
-</li>
-</ul>
-<a name="DatabaseLoadFailedException-java.lang.String-java.lang.String-java.lang.Throwable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DatabaseLoadFailedException</h4>
-<pre>public&nbsp;DatabaseLoadFailedException(java.lang.String&nbsp;message,
-                                   java.lang.String&nbsp;path,
-                                   java.lang.Throwable&nbsp;cause)</pre>
-</li>
-</ul>
-<a name="DatabaseLoadFailedException-java.lang.Throwable-">
+<a name="CommandLineNotInitialized-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>DatabaseLoadFailedException</h4>
-<pre>public&nbsp;DatabaseLoadFailedException(java.lang.Throwable&nbsp;cause)</pre>
+<h4>CommandLineNotInitialized</h4>
+<pre>public&nbsp;CommandLineNotInitialized(java.lang.String&nbsp;message)</pre>
 </li>
 </ul>
 </li>
@@ -274,12 +235,12 @@ extends java.lang.Exception</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/collection/Database.html" title="interface in common.collection"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/collection/Database.DatabaseLoadFailedException.html" target="_top">Frames</a></li>
-<li><a href="Database.DatabaseLoadFailedException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandLineHandler.CommandLineNotInitialized.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.CommandLineNotInitialized.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.ColorAdapter.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExecuteScriptCommand.html
similarity index 61%
rename from Lab5Core/build/docs/javadoc/common/parser/Adapters.ColorAdapter.html
rename to Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExecuteScriptCommand.html
index 36a3a00..20d909e 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.ColorAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExecuteScriptCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.ColorAdapter (Lab5Core 2.2 API)</title>
+<title>CommandLineHandler.ExecuteScriptCommand (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.ColorAdapter (Lab5Core 2.2 API)";
+            parent.document.title="CommandLineHandler.ExecuteScriptCommand (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10};
+var methods = {"i0":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -47,12 +47,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.CommandLineNotInitialized.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.ExitCommand.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.ColorAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.ColorAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandLineHandler.ExecuteScriptCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.ExecuteScriptCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,7 +73,7 @@ var activeTableTab = "activeTableTab";
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
@@ -90,18 +90,18 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">common.parser</div>
-<h2 title="Class Adapters.ColorAdapter" class="title">Class Adapters.ColorAdapter</h2>
+<div class="subTitle">common.commandline</div>
+<h2 title="Class CommandLineHandler.ExecuteScriptCommand" class="title">Class CommandLineHandler.ExecuteScriptCommand</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a href="../../common/data/Color.html" title="enum in common.data">Color</a>&gt;</li>
+<li><a href="../../common/commandline/Command.html" title="class in common.commandline">common.commandline.Command</a></li>
 <li>
 <ul class="inheritance">
-<li>common.parser.Adapters.ColorAdapter</li>
+<li>common.commandline.CommandLineHandler.ExecuteScriptCommand</li>
 </ul>
 </li>
 </ul>
@@ -111,19 +111,42 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
 <dt>Enclosing class:</dt>
-<dd><a href="../../common/parser/Adapters.html" title="class in common.parser">Adapters</a></dd>
+<dd><a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">Adapters.ColorAdapter</span>
-extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a href="../../common/data/Color.html" title="enum in common.data">Color</a>&gt;</pre>
+<pre>public class <span class="typeNameLabel">CommandLineHandler.ExecuteScriptCommand</span>
+extends <a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#common.commandline.CommandLineHandler.ExecuteScriptCommand">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;common.commandline.<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../common/commandline/Command.html#alias">alias</a>, <a href="../../common/commandline/Command.html#args">args</a>, <a href="../../common/commandline/Command.html#clientOnly">clientOnly</a>, <a href="../../common/commandline/Command.html#description">description</a>, <a href="../../common/commandline/Command.html#executable">executable</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -136,7 +159,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.ColorAdapter.html#ColorAdapter--">ColorAdapter</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.ExecuteScriptCommand.html#ExecuteScriptCommand--">ExecuteScriptCommand</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -154,15 +177,18 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.ColorAdapter.html#marshal-common.data.Color-">marshal</a></span>(<a href="../../common/data/Color.html" title="enum in common.data">Color</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../common/data/Color.html" title="enum in common.data">Color</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.ColorAdapter.html#unmarshal-java.lang.String-">unmarshal</a></span>(java.lang.String&nbsp;v)</code>&nbsp;</td>
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.ExecuteScriptCommand.html#validate-java.lang.String:A-">validate</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;common.commandline.<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../common/commandline/Command.html#executeOnClient--">executeOnClient</a></code></li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -183,13 +209,13 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ColorAdapter--">
+<a name="ExecuteScriptCommand--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>ColorAdapter</h4>
-<pre>public&nbsp;ColorAdapter()</pre>
+<h4>ExecuteScriptCommand</h4>
+<pre>public&nbsp;ExecuteScriptCommand()</pre>
 </li>
 </ul>
 </li>
@@ -200,35 +226,16 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="unmarshal-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unmarshal</h4>
-<pre>public&nbsp;<a href="../../common/data/Color.html" title="enum in common.data">Color</a>&nbsp;unmarshal(java.lang.String&nbsp;v)
-                throws java.lang.Exception</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>unmarshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a href="../../common/data/Color.html" title="enum in common.data">Color</a>&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
-</dl>
-</li>
-</ul>
-<a name="marshal-common.data.Color-">
+<a name="validate-java.lang.String:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>marshal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;marshal(<a href="../../common/data/Color.html" title="enum in common.data">Color</a>&nbsp;v)
-                         throws java.lang.Exception</pre>
+<h4>validate</h4>
+<pre>public&nbsp;boolean&nbsp;validate(java.lang.String[]&nbsp;args)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>marshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a href="../../common/data/Color.html" title="enum in common.data">Color</a>&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
+<dd><code><a href="../../common/commandline/Command.html#validate-java.lang.String:A-">validate</a></code>&nbsp;in class&nbsp;<code><a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -259,12 +266,12 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.CommandLineNotInitialized.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.ExitCommand.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.ColorAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.ColorAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandLineHandler.ExecuteScriptCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.ExecuteScriptCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -285,7 +292,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.CountryAdapter.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExitCommand.html
similarity index 62%
rename from Lab5Core/build/docs/javadoc/common/parser/Adapters.CountryAdapter.html
rename to Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExitCommand.html
index 2663dbf..cfda36c 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.CountryAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.ExitCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.CountryAdapter (Lab5Core 2.2 API)</title>
+<title>CommandLineHandler.ExitCommand (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.CountryAdapter (Lab5Core 2.2 API)";
+            parent.document.title="CommandLineHandler.ExitCommand (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10};
+var methods = {"i0":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -47,12 +47,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.HeightAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.CountryAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.CountryAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandLineHandler.ExitCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.ExitCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,7 +73,7 @@ var activeTableTab = "activeTableTab";
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
@@ -90,18 +90,18 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">common.parser</div>
-<h2 title="Class Adapters.CountryAdapter" class="title">Class Adapters.CountryAdapter</h2>
+<div class="subTitle">common.commandline</div>
+<h2 title="Class CommandLineHandler.ExitCommand" class="title">Class CommandLineHandler.ExitCommand</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a href="../../common/data/Country.html" title="enum in common.data">Country</a>&gt;</li>
+<li><a href="../../common/commandline/Command.html" title="class in common.commandline">common.commandline.Command</a></li>
 <li>
 <ul class="inheritance">
-<li>common.parser.Adapters.CountryAdapter</li>
+<li>common.commandline.CommandLineHandler.ExitCommand</li>
 </ul>
 </li>
 </ul>
@@ -111,19 +111,42 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
 <dt>Enclosing class:</dt>
-<dd><a href="../../common/parser/Adapters.html" title="class in common.parser">Adapters</a></dd>
+<dd><a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">Adapters.CountryAdapter</span>
-extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a href="../../common/data/Country.html" title="enum in common.data">Country</a>&gt;</pre>
+<pre>public class <span class="typeNameLabel">CommandLineHandler.ExitCommand</span>
+extends <a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#common.commandline.CommandLineHandler.ExitCommand">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;common.commandline.<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../common/commandline/Command.html#alias">alias</a>, <a href="../../common/commandline/Command.html#args">args</a>, <a href="../../common/commandline/Command.html#clientOnly">clientOnly</a>, <a href="../../common/commandline/Command.html#description">description</a>, <a href="../../common/commandline/Command.html#executable">executable</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -136,7 +159,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.CountryAdapter.html#CountryAdapter--">CountryAdapter</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.ExitCommand.html#ExitCommand--">ExitCommand</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -154,15 +177,18 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.CountryAdapter.html#marshal-common.data.Country-">marshal</a></span>(<a href="../../common/data/Country.html" title="enum in common.data">Country</a>&nbsp;v)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../common/data/Country.html" title="enum in common.data">Country</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.CountryAdapter.html#unmarshal-java.lang.String-">unmarshal</a></span>(java.lang.String&nbsp;v)</code>&nbsp;</td>
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.ExitCommand.html#validate-java.lang.String:A-">validate</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;common.commandline.<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../common/commandline/Command.html#executeOnClient--">executeOnClient</a></code></li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -183,13 +209,13 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="CountryAdapter--">
+<a name="ExitCommand--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>CountryAdapter</h4>
-<pre>public&nbsp;CountryAdapter()</pre>
+<h4>ExitCommand</h4>
+<pre>public&nbsp;ExitCommand()</pre>
 </li>
 </ul>
 </li>
@@ -200,35 +226,16 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="unmarshal-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unmarshal</h4>
-<pre>public&nbsp;<a href="../../common/data/Country.html" title="enum in common.data">Country</a>&nbsp;unmarshal(java.lang.String&nbsp;v)
-                  throws java.lang.Exception</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>unmarshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a href="../../common/data/Country.html" title="enum in common.data">Country</a>&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
-</dl>
-</li>
-</ul>
-<a name="marshal-common.data.Country-">
+<a name="validate-java.lang.String:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>marshal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;marshal(<a href="../../common/data/Country.html" title="enum in common.data">Country</a>&nbsp;v)
-                         throws java.lang.Exception</pre>
+<h4>validate</h4>
+<pre>public&nbsp;boolean&nbsp;validate(java.lang.String[]&nbsp;args)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>marshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a href="../../common/data/Country.html" title="enum in common.data">Country</a>&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
+<dd><code><a href="../../common/commandline/Command.html#validate-java.lang.String:A-">validate</a></code>&nbsp;in class&nbsp;<code><a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -259,12 +266,12 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.HeightAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.CountryAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.CountryAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandLineHandler.ExitCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.ExitCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -285,7 +292,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,<a hre
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.HeightAdapter.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.HistoryCommand.html
similarity index 62%
rename from Lab5Core/build/docs/javadoc/common/parser/Adapters.HeightAdapter.html
rename to Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.HistoryCommand.html
index 8a61f08..a720c49 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.HeightAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.HistoryCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.HeightAdapter (Lab5Core 2.2 API)</title>
+<title>CommandLineHandler.HistoryCommand (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.HeightAdapter (Lab5Core 2.2 API)";
+            parent.document.title="CommandLineHandler.HistoryCommand (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10};
+var methods = {"i0":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -47,12 +47,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.CountryAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.ExitCommand.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.HeightAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.HeightAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandLineHandler.HistoryCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.HistoryCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,7 +73,7 @@ var activeTableTab = "activeTableTab";
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
@@ -90,18 +90,18 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">common.parser</div>
-<h2 title="Class Adapters.HeightAdapter" class="title">Class Adapters.HeightAdapter</h2>
+<div class="subTitle">common.commandline</div>
+<h2 title="Class CommandLineHandler.HistoryCommand" class="title">Class CommandLineHandler.HistoryCommand</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.Integer&gt;</li>
+<li><a href="../../common/commandline/Command.html" title="class in common.commandline">common.commandline.Command</a></li>
 <li>
 <ul class="inheritance">
-<li>common.parser.Adapters.HeightAdapter</li>
+<li>common.commandline.CommandLineHandler.HistoryCommand</li>
 </ul>
 </li>
 </ul>
@@ -111,19 +111,42 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
 <dt>Enclosing class:</dt>
-<dd><a href="../../common/parser/Adapters.html" title="class in common.parser">Adapters</a></dd>
+<dd><a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">Adapters.HeightAdapter</span>
-extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.Integer&gt;</pre>
+<pre>public class <span class="typeNameLabel">CommandLineHandler.HistoryCommand</span>
+extends <a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#common.commandline.CommandLineHandler.HistoryCommand">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;common.commandline.<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../common/commandline/Command.html#alias">alias</a>, <a href="../../common/commandline/Command.html#args">args</a>, <a href="../../common/commandline/Command.html#clientOnly">clientOnly</a>, <a href="../../common/commandline/Command.html#description">description</a>, <a href="../../common/commandline/Command.html#executable">executable</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -136,7 +159,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.HeightAdapter.html#HeightAdapter--">HeightAdapter</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.HistoryCommand.html#HistoryCommand--">HistoryCommand</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -154,15 +177,18 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.HeightAdapter.html#marshal-java.lang.Integer-">marshal</a></span>(java.lang.Integer&nbsp;v)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.lang.Integer</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.HeightAdapter.html#unmarshal-java.lang.String-">unmarshal</a></span>(java.lang.String&nbsp;v)</code>&nbsp;</td>
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.HistoryCommand.html#validate-java.lang.String:A-">validate</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;common.commandline.<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../common/commandline/Command.html#executeOnClient--">executeOnClient</a></code></li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -183,13 +209,13 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="HeightAdapter--">
+<a name="HistoryCommand--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>HeightAdapter</h4>
-<pre>public&nbsp;HeightAdapter()</pre>
+<h4>HistoryCommand</h4>
+<pre>public&nbsp;HistoryCommand()</pre>
 </li>
 </ul>
 </li>
@@ -200,35 +226,16 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="unmarshal-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unmarshal</h4>
-<pre>public&nbsp;java.lang.Integer&nbsp;unmarshal(java.lang.String&nbsp;v)
-                            throws java.lang.Exception</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>unmarshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.Integer&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
-</dl>
-</li>
-</ul>
-<a name="marshal-java.lang.Integer-">
+<a name="validate-java.lang.String:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>marshal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;marshal(java.lang.Integer&nbsp;v)
-                         throws java.lang.Exception</pre>
+<h4>validate</h4>
+<pre>public&nbsp;boolean&nbsp;validate(java.lang.String[]&nbsp;args)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>marshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.Integer&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
+<dd><code><a href="../../common/commandline/Command.html#validate-java.lang.String:A-">validate</a></code>&nbsp;in class&nbsp;<code><a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -259,12 +266,12 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.CountryAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.ExitCommand.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.HeightAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.HeightAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandLineHandler.HistoryCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.HistoryCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -285,7 +292,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.html
new file mode 100644
index 0000000..53b81c1
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/CommandLineHandler.html
@@ -0,0 +1,672 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>CommandLineHandler (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="CommandLineHandler (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"i5":6,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/Command.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.CommandLineNotInitialized.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/CommandLineHandler.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">common.commandline</div>
+<h2 title="Class CommandLineHandler" class="title">Class CommandLineHandler</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.CommandLineHandler</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">CommandLineHandler</span>
+extends java.lang.Object</pre>
+<div class="block">Класс обработчика командной строки, реализует шаблон проектирования Singleton,
+ читает ввод с командной строки, обрабатывает его и вызывает соответствующую команду
+ на выполнение из регистра команд, используйте метод <a href="../../common/commandline/CommandLineHandler.html#start--"><code>start()</code></a> для его запуска</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../common/commandline/CommandRegistry.html" title="class in common.commandline"><code>CommandRegistry</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.CommandLineNotInitialized.html" title="class in common.commandline">CommandLineHandler.CommandLineNotInitialized</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in common.commandline">CommandLineHandler.ExecuteScriptCommand</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.ExitCommand.html" title="class in common.commandline">CommandLineHandler.ExitCommand</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline">CommandLineHandler.HistoryCommand</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected java.util.Deque&lt;java.lang.String&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#fileNames">fileNames</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected java.util.List&lt;java.lang.String&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#history">history</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected java.util.Deque&lt;java.io.Reader&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#inputs">inputs</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected static <a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#instance">instance</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#isActive">isActive</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected java.io.BufferedReader</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#reader">reader</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier</th>
+<th class="colLast" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected </code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#CommandLineHandler--">CommandLineHandler</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#addNewInput-java.io.Reader-java.lang.String-">addNewInput</a></span>(java.io.Reader&nbsp;reader,
+           java.lang.String&nbsp;filePath)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#awaitInput-java.lang.String-java.lang.String-">awaitInput</a></span>(java.lang.String&nbsp;msg,
+          java.lang.String&nbsp;err)</code>
+<div class="block">Метод, ожидающий ввода из потока ввода <a href="../../common/commandline/CommandLineHandler.html#reader"><code>reader</code></a> и возвращающий результат,
+ печатает запрос msg перед ожиданием данных (если их вводит пользователь),
+ печатает ошибку err, если при вводе данных произошла ошибка</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#awaitInput-java.lang.String-java.lang.String-java.util.function.Predicate-">awaitInput</a></span>(java.lang.String&nbsp;msg,
+          java.lang.String&nbsp;err,
+          java.util.function.Predicate&lt;java.lang.String&gt;&nbsp;predicate)</code>
+<div class="block">Метод, ожидающий ввода из потока ввода <a href="../../common/commandline/CommandLineHandler.html#reader"><code>reader </code></a> и возвращающий результат,
+ печатает запрос msg перед ожиданием данных (если их вводит пользователь),
+ печатает ошибку err, если введенные данные не соответствуют предикату predicate</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>&lt;T&gt;&nbsp;T</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#awaitInput-java.lang.String-java.lang.String-java.util.function.Predicate-java.util.function.Function-">awaitInput</a></span>(java.lang.String&nbsp;msg,
+          java.lang.String&nbsp;err,
+          java.util.function.Predicate&lt;java.lang.String&gt;&nbsp;predicate,
+          java.util.function.Function&lt;java.lang.String,T&gt;&nbsp;transform)</code>
+<div class="block">Метод, ожидающий ввода из потока ввода <a href="../../common/commandline/CommandLineHandler.html#reader"><code>reader</code></a> и возвращающий результат,
+ печатает запрос msg перед ожиданием данных (если их вводит пользователь),
+ печатает ошибку err, если введенные данные не соответствуют предикату predicate,
+ преобразует результат в тип T в соответствии с функцией transform</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>protected static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#clearScreen--">clearScreen</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#executeCommand-java.lang.String-java.lang.String:A-">executeCommand</a></span>(java.lang.String&nbsp;alias,
+              java.lang.String[]&nbsp;args)</code>&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code><a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#executeScript-java.lang.String-">executeScript</a></span>(java.lang.String&nbsp;fileName)</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#exit--">exit</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>static <a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#getInstance--">getInstance</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code><a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#history--">history</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#history-int-">history</a></span>(int&nbsp;amount)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#input--">input</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#isActive--">isActive</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#removeInput--">removeInput</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#start--">start</a></span>()</code>
+<div class="block">Метод, запускающий обработчик командной строки, для остановки требуется ввести команду "exit"</div>
+</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandLineHandler.html#updateHistory-java.lang.String-">updateHistory</a></span>(java.lang.String&nbsp;command)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="instance">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>instance</h4>
+<pre>protected static&nbsp;<a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a> instance</pre>
+</li>
+</ul>
+<a name="inputs">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>inputs</h4>
+<pre>protected final&nbsp;java.util.Deque&lt;java.io.Reader&gt; inputs</pre>
+</li>
+</ul>
+<a name="fileNames">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fileNames</h4>
+<pre>protected final&nbsp;java.util.Deque&lt;java.lang.String&gt; fileNames</pre>
+</li>
+</ul>
+<a name="history">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>history</h4>
+<pre>protected final&nbsp;java.util.List&lt;java.lang.String&gt; history</pre>
+</li>
+</ul>
+<a name="reader">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>reader</h4>
+<pre>protected&nbsp;java.io.BufferedReader reader</pre>
+</li>
+</ul>
+<a name="isActive">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isActive</h4>
+<pre>protected&nbsp;boolean isActive</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="CommandLineHandler--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CommandLineHandler</h4>
+<pre>protected&nbsp;CommandLineHandler()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getInstance--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getInstance</h4>
+<pre>public static&nbsp;<a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a>&nbsp;getInstance()</pre>
+</li>
+</ul>
+<a name="start--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>start</h4>
+<pre>public&nbsp;void&nbsp;start()</pre>
+<div class="block">Метод, запускающий обработчик командной строки, для остановки требуется ввести команду "exit"</div>
+</li>
+</ul>
+<a name="clearScreen--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>clearScreen</h4>
+<pre>protected static&nbsp;void&nbsp;clearScreen()</pre>
+</li>
+</ul>
+<a name="input--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>input</h4>
+<pre>protected&nbsp;void&nbsp;input()</pre>
+</li>
+</ul>
+<a name="executeCommand-java.lang.String-java.lang.String:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>executeCommand</h4>
+<pre>protected abstract&nbsp;void&nbsp;executeCommand(java.lang.String&nbsp;alias,
+                                       java.lang.String[]&nbsp;args)</pre>
+</li>
+</ul>
+<a name="updateHistory-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>updateHistory</h4>
+<pre>protected&nbsp;void&nbsp;updateHistory(java.lang.String&nbsp;command)</pre>
+</li>
+</ul>
+<a name="isActive--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isActive</h4>
+<pre>public&nbsp;boolean&nbsp;isActive()</pre>
+</li>
+</ul>
+<a name="awaitInput-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>awaitInput</h4>
+<pre>public&nbsp;java.lang.String&nbsp;awaitInput(java.lang.String&nbsp;msg,
+                                   java.lang.String&nbsp;err)</pre>
+<div class="block">Метод, ожидающий ввода из потока ввода <a href="../../common/commandline/CommandLineHandler.html#reader"><code>reader</code></a> и возвращающий результат,
+ печатает запрос msg перед ожиданием данных (если их вводит пользователь),
+ печатает ошибку err, если при вводе данных произошла ошибка</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>msg</code> - Строка, печатающаяся как запрос данных от пользователя</dd>
+<dd><code>err</code> - Строка, печатающаяся во время ошибки</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Строка из потока ввода</dd>
+</dl>
+</li>
+</ul>
+<a name="awaitInput-java.lang.String-java.lang.String-java.util.function.Predicate-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>awaitInput</h4>
+<pre>public&nbsp;java.lang.String&nbsp;awaitInput(java.lang.String&nbsp;msg,
+                                   java.lang.String&nbsp;err,
+                                   java.util.function.Predicate&lt;java.lang.String&gt;&nbsp;predicate)</pre>
+<div class="block">Метод, ожидающий ввода из потока ввода <a href="../../common/commandline/CommandLineHandler.html#reader"><code>reader </code></a> и возвращающий результат,
+ печатает запрос msg перед ожиданием данных (если их вводит пользователь),
+ печатает ошибку err, если введенные данные не соответствуют предикату predicate</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>msg</code> - Строка, печатающаяся как запрос данных от пользователя</dd>
+<dd><code>err</code> - Строка, печатающаяся при несоответствии ввода предикату</dd>
+<dd><code>predicate</code> - Предикат, определяющий валидность введенных данных</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Строка из потока ввода</dd>
+</dl>
+</li>
+</ul>
+<a name="awaitInput-java.lang.String-java.lang.String-java.util.function.Predicate-java.util.function.Function-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>awaitInput</h4>
+<pre>public&nbsp;&lt;T&gt;&nbsp;T&nbsp;awaitInput(java.lang.String&nbsp;msg,
+                        java.lang.String&nbsp;err,
+                        java.util.function.Predicate&lt;java.lang.String&gt;&nbsp;predicate,
+                        java.util.function.Function&lt;java.lang.String,T&gt;&nbsp;transform)</pre>
+<div class="block">Метод, ожидающий ввода из потока ввода <a href="../../common/commandline/CommandLineHandler.html#reader"><code>reader</code></a> и возвращающий результат,
+ печатает запрос msg перед ожиданием данных (если их вводит пользователь),
+ печатает ошибку err, если введенные данные не соответствуют предикату predicate,
+ преобразует результат в тип T в соответствии с функцией transform</div>
+<dl>
+<dt><span class="paramLabel">Type Parameters:</span></dt>
+<dd><code>T</code> - Тип, к которому будет приведен результат</dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>msg</code> - Строка, печатающаяся как запрос данных от пользователя</dd>
+<dd><code>err</code> - Строка, печатающаяся при несоответствии ввода предикату</dd>
+<dd><code>predicate</code> - Предикат, определяющий валидность введенных данных</dd>
+<dd><code>transform</code> - Функция, преобразующая результат в тип T</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Результат типа T</dd>
+</dl>
+</li>
+</ul>
+<a name="addNewInput-java.io.Reader-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addNewInput</h4>
+<pre>public&nbsp;void&nbsp;addNewInput(java.io.Reader&nbsp;reader,
+                        java.lang.String&nbsp;filePath)</pre>
+</li>
+</ul>
+<a name="removeInput--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeInput</h4>
+<pre>public&nbsp;void&nbsp;removeInput()</pre>
+</li>
+</ul>
+<a name="executeScript-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>executeScript</h4>
+<pre>public&nbsp;<a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a>&nbsp;executeScript(java.lang.String&nbsp;fileName)</pre>
+</li>
+</ul>
+<a name="history--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>history</h4>
+<pre>public&nbsp;<a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a>&nbsp;history()</pre>
+</li>
+</ul>
+<a name="history-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>history</h4>
+<pre>public&nbsp;<a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a>&nbsp;history(int&nbsp;amount)</pre>
+</li>
+</ul>
+<a name="exit--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>exit</h4>
+<pre>public&nbsp;<a href="../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a>&nbsp;exit()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/Command.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandLineHandler.CommandLineNotInitialized.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/CommandLineHandler.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandler.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandAlreadyExistsException.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandAlreadyExistsException.html
new file mode 100644
index 0000000..9c7181f
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandAlreadyExistsException.html
@@ -0,0 +1,228 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>CommandRegistry.CommandAlreadyExistsException (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="CommandRegistry.CommandAlreadyExistsException (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/CommandRegistry.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.CommandNotFoundException.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/CommandRegistry.CommandAlreadyExistsException.html" target="_top">Frames</a></li>
+<li><a href="CommandRegistry.CommandAlreadyExistsException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">common.commandline</div>
+<h2 title="Class CommandRegistry.CommandAlreadyExistsException" class="title">Class CommandRegistry.CommandAlreadyExistsException</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.RuntimeException</li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.CommandRegistry.CommandAlreadyExistsException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../common/commandline/CommandRegistry.html" title="class in common.commandline">CommandRegistry</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="typeNameLabel">CommandRegistry.CommandAlreadyExistsException</span>
+extends java.lang.RuntimeException</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#common.commandline.CommandRegistry.CommandAlreadyExistsException">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/CommandRegistry.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.CommandNotFoundException.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/CommandRegistry.CommandAlreadyExistsException.html" target="_top">Frames</a></li>
+<li><a href="CommandRegistry.CommandAlreadyExistsException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandNotFoundException.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandNotFoundException.html
new file mode 100644
index 0000000..e3ea560
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.CommandNotFoundException.html
@@ -0,0 +1,228 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>CommandRegistry.CommandNotFoundException (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="CommandRegistry.CommandNotFoundException (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/CommandRegistry.CommandAlreadyExistsException.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/CommandRegistry.CommandNotFoundException.html" target="_top">Frames</a></li>
+<li><a href="CommandRegistry.CommandNotFoundException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">common.commandline</div>
+<h2 title="Class CommandRegistry.CommandNotFoundException" class="title">Class CommandRegistry.CommandNotFoundException</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.RuntimeException</li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.CommandRegistry.CommandNotFoundException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../common/commandline/CommandRegistry.html" title="class in common.commandline">CommandRegistry</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="typeNameLabel">CommandRegistry.CommandNotFoundException</span>
+extends java.lang.RuntimeException</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#common.commandline.CommandRegistry.CommandNotFoundException">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/CommandRegistry.CommandAlreadyExistsException.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/CommandRegistry.CommandNotFoundException.html" target="_top">Frames</a></li>
+<li><a href="CommandRegistry.CommandNotFoundException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.java.lang.Throwable">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.CoordinateYAdapter.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.HelpCommand.html
similarity index 62%
rename from Lab5Core/build/docs/javadoc/common/parser/Adapters.CoordinateYAdapter.html
rename to Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.HelpCommand.html
index 6cd919b..940813b 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.CoordinateYAdapter.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.HelpCommand.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters.CoordinateYAdapter (Lab5Core 2.2 API)</title>
+<title>CommandRegistry.HelpCommand (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.CoordinateYAdapter (Lab5Core 2.2 API)";
+            parent.document.title="CommandRegistry.HelpCommand (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10};
+var methods = {"i0":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -47,12 +47,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.ColorAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.CountryAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.CommandNotFoundException.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/Executable.html" title="interface in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.CoordinateYAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.CoordinateYAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandRegistry.HelpCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandRegistry.HelpCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -73,7 +73,7 @@ var activeTableTab = "activeTableTab";
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
@@ -90,18 +90,18 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">common.parser</div>
-<h2 title="Class Adapters.CoordinateYAdapter" class="title">Class Adapters.CoordinateYAdapter</h2>
+<div class="subTitle">common.commandline</div>
+<h2 title="Class CommandRegistry.HelpCommand" class="title">Class CommandRegistry.HelpCommand</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.Float&gt;</li>
+<li><a href="../../common/commandline/Command.html" title="class in common.commandline">common.commandline.Command</a></li>
 <li>
 <ul class="inheritance">
-<li>common.parser.Adapters.CoordinateYAdapter</li>
+<li>common.commandline.CommandRegistry.HelpCommand</li>
 </ul>
 </li>
 </ul>
@@ -111,19 +111,42 @@ var activeTableTab = "activeTableTab";
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<dl>
 <dt>Enclosing class:</dt>
-<dd><a href="../../common/parser/Adapters.html" title="class in common.parser">Adapters</a></dd>
+<dd><a href="../../common/commandline/CommandRegistry.html" title="class in common.commandline">CommandRegistry</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public static class <span class="typeNameLabel">Adapters.CoordinateYAdapter</span>
-extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.Float&gt;</pre>
+<pre>public static class <span class="typeNameLabel">CommandRegistry.HelpCommand</span>
+extends <a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../serialized-form.html#common.commandline.CommandRegistry.HelpCommand">Serialized Form</a></dd>
+</dl>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;common.commandline.<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../common/commandline/Command.html#alias">alias</a>, <a href="../../common/commandline/Command.html#args">args</a>, <a href="../../common/commandline/Command.html#clientOnly">clientOnly</a>, <a href="../../common/commandline/Command.html#description">description</a>, <a href="../../common/commandline/Command.html#executable">executable</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -136,7 +159,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.CoordinateYAdapter.html#CoordinateYAdapter--">CoordinateYAdapter</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.HelpCommand.html#HelpCommand--">HelpCommand</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -154,15 +177,18 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.CoordinateYAdapter.html#marshal-java.lang.Float-">marshal</a></span>(java.lang.Float&nbsp;v)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.lang.Float</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.CoordinateYAdapter.html#unmarshal-java.lang.String-">unmarshal</a></span>(java.lang.String&nbsp;v)</code>&nbsp;</td>
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.HelpCommand.html#validate-java.lang.String:A-">validate</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;common.commandline.<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../common/commandline/Command.html#executeOnClient--">executeOnClient</a></code></li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -183,13 +209,13 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="CoordinateYAdapter--">
+<a name="HelpCommand--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>CoordinateYAdapter</h4>
-<pre>public&nbsp;CoordinateYAdapter()</pre>
+<h4>HelpCommand</h4>
+<pre>public&nbsp;HelpCommand()</pre>
 </li>
 </ul>
 </li>
@@ -200,35 +226,16 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="unmarshal-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unmarshal</h4>
-<pre>public&nbsp;java.lang.Float&nbsp;unmarshal(java.lang.String&nbsp;v)
-                          throws java.lang.Exception</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>unmarshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.Float&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
-</dl>
-</li>
-</ul>
-<a name="marshal-java.lang.Float-">
+<a name="validate-java.lang.String:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>marshal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;marshal(java.lang.Float&nbsp;v)
-                         throws java.lang.Exception</pre>
+<h4>validate</h4>
+<pre>public&nbsp;boolean&nbsp;validate(java.lang.String[]&nbsp;args)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>marshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.Float&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
+<dd><code><a href="../../common/commandline/Command.html#validate-java.lang.String:A-">validate</a></code>&nbsp;in class&nbsp;<code><a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -259,12 +266,12 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.ColorAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.CountryAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.CommandNotFoundException.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/Executable.html" title="interface in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.CoordinateYAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.CoordinateYAdapter.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/commandline/CommandRegistry.HelpCommand.html" target="_top">Frames</a></li>
+<li><a href="CommandRegistry.HelpCommand.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -285,7 +292,7 @@ extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.l
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.html b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.html
new file mode 100644
index 0000000..8e997aa
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/CommandRegistry.html
@@ -0,0 +1,314 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>CommandRegistry (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="CommandRegistry (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.CommandAlreadyExistsException.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/CommandRegistry.html" target="_top">Frames</a></li>
+<li><a href="CommandRegistry.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">common.commandline</div>
+<h2 title="Class CommandRegistry" class="title">Class CommandRegistry</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.CommandRegistry</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">CommandRegistry</span>
+extends java.lang.Object</pre>
+<div class="block">Класс регистра команд, используемый для добавления, переопределения или удаления команд</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.CommandAlreadyExistsException.html" title="class in common.commandline">CommandRegistry.CommandAlreadyExistsException</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.CommandNotFoundException.html" title="class in common.commandline">CommandRegistry.CommandNotFoundException</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline">CommandRegistry.HelpCommand</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.html#getCommand-java.lang.String-">getCommand</a></span>(java.lang.String&nbsp;alias)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.html#reassignCommand-common.commandline.Command-">reassignCommand</a></span>(<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a>&nbsp;command)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.html#registerCommand-common.commandline.Command-">registerCommand</a></span>(<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a>&nbsp;command)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.html#registerCommands-common.commandline.Command...-">registerCommands</a></span>(<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a>...&nbsp;commands)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/CommandRegistry.html#unregisterCommand-java.lang.String-">unregisterCommand</a></span>(java.lang.String&nbsp;alias)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="registerCommand-common.commandline.Command-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>registerCommand</h4>
+<pre>public static&nbsp;void&nbsp;registerCommand(<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a>&nbsp;command)</pre>
+</li>
+</ul>
+<a name="registerCommands-common.commandline.Command...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>registerCommands</h4>
+<pre>public static&nbsp;void&nbsp;registerCommands(<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a>...&nbsp;commands)</pre>
+</li>
+</ul>
+<a name="reassignCommand-common.commandline.Command-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>reassignCommand</h4>
+<pre>public static&nbsp;void&nbsp;reassignCommand(<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a>&nbsp;command)</pre>
+</li>
+</ul>
+<a name="unregisterCommand-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>unregisterCommand</h4>
+<pre>public static&nbsp;void&nbsp;unregisterCommand(java.lang.String&nbsp;alias)</pre>
+</li>
+</ul>
+<a name="getCommand-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getCommand</h4>
+<pre>public static&nbsp;<a href="../../common/commandline/Command.html" title="class in common.commandline">Command</a>&nbsp;getCommand(java.lang.String&nbsp;alias)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../common/commandline/CommandRegistry.CommandAlreadyExistsException.html" title="class in common.commandline"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/CommandRegistry.html" target="_top">Frames</a></li>
+<li><a href="CommandRegistry.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/Executable.html b/Lab5Core/build/docs/javadoc/common/commandline/Executable.html
index 281dd46..567bd86 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/Executable.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/Executable.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Executable (Lab5Core 2.2 API)</title>
+<title>Executable (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Executable (Lab5Core 2.2 API)";
+            parent.document.title="Executable (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/Executables.html b/Lab5Core/build/docs/javadoc/common/commandline/Executables.html
index 7e06294..df05f37 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/Executables.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/Executables.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Executables (Lab5Core 2.2 API)</title>
+<title>Executables (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Executables (Lab5Core 2.2 API)";
+            parent.document.title="Executables (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":9,"i2":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -74,13 +74,13 @@ var activeTableTab = "activeTableTab";
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -171,6 +171,25 @@ extends java.lang.Enum&lt;<a href="../../common/commandline/Executables.html" ti
 </table>
 </li>
 </ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Executables.html#executable">executable</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
 <li class="blockList"><a name="method.summary">
@@ -178,22 +197,18 @@ extends java.lang.Enum&lt;<a href="../../common/commandline/Executables.html" ti
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Executables.html#getExecutable--">getExecutable</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
 <td class="colFirst"><code>static <a href="../../common/commandline/Executables.html" title="enum in common.commandline">Executables</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Executables.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code>static <a href="../../common/commandline/Executables.html" title="enum in common.commandline">Executables</a>[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/Executables.html#values--">values</a></span>()</code>
 <div class="block">Returns an array containing the constants of this enum type, in
@@ -330,6 +345,23 @@ the order they are declared.</div>
 </ul>
 </li>
 </ul>
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="executable">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>executable</h4>
+<pre>public final&nbsp;<a href="../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a> executable</pre>
+</li>
+</ul>
+</li>
+</ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
 <li class="blockList"><a name="method.detail">
@@ -359,7 +391,7 @@ for (Executables c : Executables.values())
 <a name="valueOf-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
 <pre>public static&nbsp;<a href="../../common/commandline/Executables.html" title="enum in common.commandline">Executables</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
@@ -378,15 +410,6 @@ not permitted.)</div>
 </dl>
 </li>
 </ul>
-<a name="getExecutable--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getExecutable</h4>
-<pre>public&nbsp;<a href="../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a>&nbsp;getExecutable()</pre>
-</li>
-</ul>
 </li>
 </ul>
 </li>
@@ -441,13 +464,13 @@ not permitted.)</div>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html b/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html
new file mode 100644
index 0000000..cf7e0c9
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/LongStrings.html
@@ -0,0 +1,351 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>LongStrings (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="LongStrings (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":9,"i2":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/Executables.html" title="enum in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/LongStrings.html" target="_top">Frames</a></li>
+<li><a href="LongStrings.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">common.commandline</div>
+<h2 title="Enum LongStrings" class="title">Enum LongStrings</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Enum&lt;<a href="../../common/commandline/LongStrings.html" title="enum in common.commandline">LongStrings</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.LongStrings</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable, java.lang.Comparable&lt;<a href="../../common/commandline/LongStrings.html" title="enum in common.commandline">LongStrings</a>&gt;</dd>
+</dl>
+<hr>
+<br>
+<pre>public enum <span class="typeNameLabel">LongStrings</span>
+extends java.lang.Enum&lt;<a href="../../common/commandline/LongStrings.html" title="enum in common.commandline">LongStrings</a>&gt;</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/LongStrings.html#GREETINGS">GREETINGS</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/commandline/LongStrings.html#LINE">LINE</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/LongStrings.html#getValue--">getValue</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../common/commandline/LongStrings.html" title="enum in common.commandline">LongStrings</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/LongStrings.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static <a href="../../common/commandline/LongStrings.html" title="enum in common.commandline">LongStrings</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/commandline/LongStrings.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Enum</h3>
+<code>clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="LINE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>LINE</h4>
+<pre>public static final&nbsp;<a href="../../common/commandline/LongStrings.html" title="enum in common.commandline">LongStrings</a> LINE</pre>
+</li>
+</ul>
+<a name="GREETINGS">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>GREETINGS</h4>
+<pre>public static final&nbsp;<a href="../../common/commandline/LongStrings.html" title="enum in common.commandline">LongStrings</a> GREETINGS</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../common/commandline/LongStrings.html" title="enum in common.commandline">LongStrings</a>[]&nbsp;values()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (LongStrings c : LongStrings.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../common/commandline/LongStrings.html" title="enum in common.commandline">LongStrings</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
+<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+<a name="getValue--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getValue</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getValue()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../common/commandline/Executables.html" title="enum in common.commandline"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?common/commandline/LongStrings.html" target="_top">Frames</a></li>
+<li><a href="LongStrings.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html b/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html
index 3fa7660..85b7bb8 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline (Lab5Core 2.2 API)</title>
+<title>common.commandline (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html b/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html
index 87ae181..d66bec8 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline (Lab5Core 2.2 API)</title>
+<title>common.commandline (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.commandline (Lab5Core 2.2 API)";
+            parent.document.title="common.commandline (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -107,13 +107,13 @@
  на выполнение из регистра команд, используйте метод <a href="../../common/commandline/CommandLineHandler.html#start--"><code>CommandLineHandler.start()</code></a> для его запуска</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../common/commandline/CommandRegistry.html" title="class in common.commandline">CommandRegistry</a></td>
 <td class="colLast">
 <div class="block">Класс регистра команд, используемый для добавления, переопределения или удаления команд</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline">CommandRegistry.HelpCommand</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html
index b7ee41a..2c72dcc 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline Class Hierarchy (Lab5Core 2.2 API)</title>
+<title>common.commandline Class Hierarchy (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.commandline Class Hierarchy (Lab5Core 2.2 API)";
+            parent.document.title="common.commandline Class Hierarchy (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -85,11 +85,6 @@
 <li type="circle">common.commandline.<a href="../../common/commandline/CommandLineHandler.ExitCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.ExitCommand</span></a></li>
 <li type="circle">common.commandline.<a href="../../common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.HistoryCommand</span></a></li>
 <li type="circle">common.commandline.<a href="../../common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandRegistry.HelpCommand</span></a></li>
-<li type="circle">common.commandline.pdcommands.<a href="../../common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">PeopleDatabaseCommand</span></a>
-<ul>
-<li type="circle">common.commandline.<a href="../../common/commandline/CommandLineHandler.SaveCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.SaveCommand</span></a></li>
-</ul>
-</li>
 </ul>
 </li>
 <li type="circle">common.commandline.<a href="../../common/commandline/CommandLineHandler.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler</span></a></li>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommand.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommand.html
new file mode 100644
index 0000000..0b4ffcf
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommand.html
@@ -0,0 +1,342 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>PeopleDatabaseCommand (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PeopleDatabaseCommand (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?common/commandline/pdcommands/PeopleDatabaseCommand.html" target="_top">Frames</a></li>
+<li><a href="PeopleDatabaseCommand.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">common.commandline.pdcommands</div>
+<h2 title="Class PeopleDatabaseCommand" class="title">Class PeopleDatabaseCommand</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../common/commandline/Command.html" title="class in common.commandline">common.commandline.Command</a></li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.pdcommands.PeopleDatabaseCommand</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">PeopleDatabaseCommand</span>
+extends <a href="../../../common/commandline/Command.html" title="class in common.commandline">Command</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../serialized-form.html#common.commandline.pdcommands.PeopleDatabaseCommand">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;common.commandline.<a href="../../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../../common/commandline/Command.html#alias">alias</a>, <a href="../../../common/commandline/Command.html#args">args</a>, <a href="../../../common/commandline/Command.html#clientOnly">clientOnly</a>, <a href="../../../common/commandline/Command.html#description">description</a>, <a href="../../../common/commandline/Command.html#executable">executable</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommand.html#PeopleDatabaseCommand-java.lang.String-boolean-java.lang.String-">PeopleDatabaseCommand</a></span>(java.lang.String&nbsp;alias,
+                     boolean&nbsp;clientOnly,
+                     java.lang.String&nbsp;description)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommand.html#PeopleDatabaseCommand-java.lang.String-boolean-java.lang.String-common.commandline.Executable-">PeopleDatabaseCommand</a></span>(java.lang.String&nbsp;alias,
+                     boolean&nbsp;clientOnly,
+                     java.lang.String&nbsp;description,
+                     <a href="../../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a>&nbsp;executable)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommand.html#executeOnClient--">executeOnClient</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommand.html#validateIdCommand-java.lang.String:A-">validateIdCommand</a></span>(java.lang.String[]&nbsp;args)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.common.commandline.Command">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;common.commandline.<a href="../../../common/commandline/Command.html" title="class in common.commandline">Command</a></h3>
+<code><a href="../../../common/commandline/Command.html#validate-java.lang.String:A-">validate</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="PeopleDatabaseCommand-java.lang.String-boolean-java.lang.String-common.commandline.Executable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>PeopleDatabaseCommand</h4>
+<pre>public&nbsp;PeopleDatabaseCommand(java.lang.String&nbsp;alias,
+                             boolean&nbsp;clientOnly,
+                             java.lang.String&nbsp;description,
+                             <a href="../../../common/commandline/Executable.html" title="interface in common.commandline">Executable</a>&nbsp;executable)</pre>
+</li>
+</ul>
+<a name="PeopleDatabaseCommand-java.lang.String-boolean-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>PeopleDatabaseCommand</h4>
+<pre>public&nbsp;PeopleDatabaseCommand(java.lang.String&nbsp;alias,
+                             boolean&nbsp;clientOnly,
+                             java.lang.String&nbsp;description)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="executeOnClient--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>executeOnClient</h4>
+<pre>public&nbsp;<a href="../../../common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a>&nbsp;executeOnClient()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../common/commandline/Command.html#executeOnClient--">executeOnClient</a></code>&nbsp;in class&nbsp;<code><a href="../../../common/commandline/Command.html" title="class in common.commandline">Command</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="validateIdCommand-java.lang.String:A-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>validateIdCommand</h4>
+<pre>public static&nbsp;boolean&nbsp;validateIdCommand(java.lang.String[]&nbsp;args)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?common/commandline/pdcommands/PeopleDatabaseCommand.html" target="_top">Frames</a></li>
+<li><a href="PeopleDatabaseCommand.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.Command">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommands.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommands.html
new file mode 100644
index 0000000..f5c7b2f
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/PeopleDatabaseCommands.html
@@ -0,0 +1,301 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>PeopleDatabaseCommands (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="PeopleDatabaseCommands (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9,"i2":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?common/commandline/pdcommands/PeopleDatabaseCommands.html" target="_top">Frames</a></li>
+<li><a href="PeopleDatabaseCommands.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">common.commandline.pdcommands</div>
+<h2 title="Class PeopleDatabaseCommands" class="title">Class PeopleDatabaseCommands</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>common.commandline.pdcommands.PeopleDatabaseCommands</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public final class <span class="typeNameLabel">PeopleDatabaseCommands</span>
+extends java.lang.Object</pre>
+<div class="block">Класс объявления всех команд, связанных с манипуляциями над объектом класса PeopleDatabase</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../common/collection/PeopleDatabase.html" title="class in common.collection"><code>PeopleDatabase</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommands.html#peopleDatabase">peopleDatabase</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../common/data/Coordinates.html" title="class in common.data">Coordinates</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommands.html#createCoordinates--">createCoordinates</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../common/data/Location.html" title="class in common.data">Location</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommands.html#createLocation--">createLocation</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static <a href="../../../common/data/Person.html" title="class in common.data">Person</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommands.html#createPerson--">createPerson</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="peopleDatabase">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>peopleDatabase</h4>
+<pre>public static&nbsp;<a href="../../../common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a> peopleDatabase</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="createPerson--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createPerson</h4>
+<pre>public static&nbsp;<a href="../../../common/data/Person.html" title="class in common.data">Person</a>&nbsp;createPerson()</pre>
+</li>
+</ul>
+<a name="createLocation--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createLocation</h4>
+<pre>public static&nbsp;<a href="../../../common/data/Location.html" title="class in common.data">Location</a>&nbsp;createLocation()</pre>
+</li>
+</ul>
+<a name="createCoordinates--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createCoordinates</h4>
+<pre>public static&nbsp;<a href="../../../common/data/Coordinates.html" title="class in common.data">Coordinates</a>&nbsp;createCoordinates()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?common/commandline/pdcommands/PeopleDatabaseCommands.html" target="_top">Frames</a></li>
+<li><a href="PeopleDatabaseCommands.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-frame.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-frame.html
new file mode 100644
index 0000000..d158530
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-frame.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>common.commandline.pdcommands (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../common/commandline/pdcommands/package-summary.html" target="classFrame">common.commandline.pdcommands</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands" target="classFrame">PeopleDatabaseCommand</a></li>
+<li><a href="PeopleDatabaseCommands.html" title="class in common.commandline.pdcommands" target="classFrame">PeopleDatabaseCommands</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-summary.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-summary.html
new file mode 100644
index 0000000..fa3941c
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-summary.html
@@ -0,0 +1,145 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>common.commandline.pdcommands (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="common.commandline.pdcommands (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../common/commandline/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../common/commandline/response/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?common/commandline/pdcommands/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;common.commandline.pdcommands</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands">PeopleDatabaseCommand</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../common/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in common.commandline.pdcommands">PeopleDatabaseCommands</a></td>
+<td class="colLast">
+<div class="block">Класс объявления всех команд, связанных с манипуляциями над объектом класса PeopleDatabase</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../common/commandline/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../common/commandline/response/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?common/commandline/pdcommands/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-tree.html
new file mode 100644
index 0000000..8d55a4a
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/commandline/pdcommands/package-tree.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>common.commandline.pdcommands Class Hierarchy (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="common.commandline.pdcommands Class Hierarchy (Lab5Core 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../common/commandline/package-tree.html">Prev</a></li>
+<li><a href="../../../common/commandline/response/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?common/commandline/pdcommands/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package common.commandline.pdcommands</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">common.commandline.<a href="../../../common/commandline/Command.html" title="class in common.commandline"><span class="typeNameLink">Command</span></a> (implements java.io.Serializable)
+<ul>
+<li type="circle">common.commandline.pdcommands.<a href="../../../common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">PeopleDatabaseCommand</span></a></li>
+</ul>
+</li>
+<li type="circle">common.commandline.pdcommands.<a href="../../../common/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">PeopleDatabaseCommands</span></a></li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../common/commandline/package-tree.html">Prev</a></li>
+<li><a href="../../../common/commandline/response/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../index.html?common/commandline/pdcommands/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html b/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html
index 19a5cfb..ca803b8 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/CommandResult.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>CommandResult (Lab5Core 2.2 API)</title>
+<title>CommandResult (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandResult (Lab5Core 2.2 API)";
+            parent.document.title="CommandResult (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html b/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html
index b663afc..8ed8f42 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/DefaultResponse.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>DefaultResponse (Lab5Core 2.2 API)</title>
+<title>DefaultResponse (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DefaultResponse (Lab5Core 2.2 API)";
+            parent.document.title="DefaultResponse (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html b/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html
index 31f0262..730afb2 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/PeopleDatabaseResponse.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>PeopleDatabaseResponse (Lab5Core 2.2 API)</title>
+<title>PeopleDatabaseResponse (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PeopleDatabaseResponse (Lab5Core 2.2 API)";
+            parent.document.title="PeopleDatabaseResponse (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html b/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html
index 638aef5..f3fe926 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/Response.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Response (Lab5Core 2.2 API)</title>
+<title>Response (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Response (Lab5Core 2.2 API)";
+            parent.document.title="Response (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html
index 7c8e66a..9a2f03e 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline.response (Lab5Core 2.2 API)</title>
+<title>common.commandline.response (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html
index fc39887..b14ed6b 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline.response (Lab5Core 2.2 API)</title>
+<title>common.commandline.response (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.commandline.response (Lab5Core 2.2 API)";
+            parent.document.title="common.commandline.response (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html b/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html
index 0463406..cec8527 100644
--- a/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/commandline/response/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.commandline.response Class Hierarchy (Lab5Core 2.2 API)</title>
+<title>common.commandline.response Class Hierarchy (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.commandline.response Class Hierarchy (Lab5Core 2.2 API)";
+            parent.document.title="common.commandline.response Class Hierarchy (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/Color.html b/Lab5Core/build/docs/javadoc/common/data/Color.html
index 9dfbaf5..ce9bbad 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Color.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Color.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Color (Lab5Core 2.2 API)</title>
+<title>Color (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Color (Lab5Core 2.2 API)";
+            parent.document.title="Color (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/Coordinates.html b/Lab5Core/build/docs/javadoc/common/data/Coordinates.html
index 79b9674..569961e 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Coordinates.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Coordinates.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Coordinates (Lab5Core 2.2 API)</title>
+<title>Coordinates (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Coordinates (Lab5Core 2.2 API)";
+            parent.document.title="Coordinates (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10};
+var methods = {"i0":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -161,12 +161,6 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Coordinates.html"
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Coordinates.html#compareTo-common.data.Coordinates-">compareTo</a></span>(<a href="../../common/data/Coordinates.html" title="class in common.data">Coordinates</a>&nbsp;other)</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Coordinates.html#setY-float-">setY</a></span>(float&nbsp;y)</code>
-<div class="block">Сеттер для поля y</div>
-</td>
-</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -213,20 +207,6 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Coordinates.html"
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="setY-float-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setY</h4>
-<pre>public&nbsp;void&nbsp;setY(float&nbsp;y)</pre>
-<div class="block">Сеттер для поля y</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>y</code> - Координата Y</dd>
-</dl>
-</li>
-</ul>
 <a name="compareTo-common.data.Coordinates-">
 <!--   -->
 </a>
diff --git a/Lab5Core/build/docs/javadoc/common/data/Country.html b/Lab5Core/build/docs/javadoc/common/data/Country.html
index 43c76da..a33e104 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Country.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Country.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Country (Lab5Core 2.2 API)</title>
+<title>Country (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Country (Lab5Core 2.2 API)";
+            parent.document.title="Country (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/data/Location.html b/Lab5Core/build/docs/javadoc/common/data/Location.html
index 8fb85f2..ef45521 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Location.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Location.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Location (Lab5Core 2.2 API)</title>
+<title>Location (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Location (Lab5Core 2.2 API)";
+            parent.document.title="Location (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10};
+var methods = {"i0":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -167,12 +167,6 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Location.html" tit
  сравнение производится по имени локации и расстоянию до точки (0; 0; 0)</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Location.html#setName-java.lang.String-">setName</a></span>(java.lang.String&nbsp;name)</code>
-<div class="block">Сеттер для поля name</div>
-</td>
-</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -225,20 +219,6 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Location.html" tit
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="setName-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setName</h4>
-<pre>public&nbsp;void&nbsp;setName(java.lang.String&nbsp;name)</pre>
-<div class="block">Сеттер для поля name</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - Имя локации</dd>
-</dl>
-</li>
-</ul>
 <a name="compareTo-common.data.Location-">
 <!--   -->
 </a>
diff --git a/Lab5Core/build/docs/javadoc/common/data/Person.html b/Lab5Core/build/docs/javadoc/common/data/Person.html
index 90ec88c..3301575 100644
--- a/Lab5Core/build/docs/javadoc/common/data/Person.html
+++ b/Lab5Core/build/docs/javadoc/common/data/Person.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Person (Lab5Core 2.2 API)</title>
+<title>Person (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Person (Lab5Core 2.2 API)";
+            parent.document.title="Person (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -138,7 +138,8 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/data/Person.html#Person-java.lang.String-common.data.Coordinates-java.lang.Integer-java.lang.String-common.data.Color-common.data.Country-common.data.Location-">Person</a></span>(@NonNull java.lang.String&nbsp;name,
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/data/Person.html#Person-long-java.lang.String-common.data.Coordinates-java.lang.Integer-java.lang.String-common.data.Color-common.data.Country-common.data.Location-">Person</a></span>(long&nbsp;id,
+      @NonNull java.lang.String&nbsp;name,
       @NonNull <a href="../../common/data/Coordinates.html" title="class in common.data">Coordinates</a>&nbsp;coordinates,
       java.lang.Integer&nbsp;height,
       java.lang.String&nbsp;passportID,
@@ -148,6 +149,15 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
 <div class="block">Конструктор с параметрами</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/data/Person.html#Person-java.lang.String-common.data.Coordinates-java.lang.Integer-java.lang.String-common.data.Color-common.data.Country-common.data.Location-">Person</a></span>(@NonNull java.lang.String&nbsp;name,
+      @NonNull <a href="../../common/data/Coordinates.html" title="class in common.data">Coordinates</a>&nbsp;coordinates,
+      java.lang.Integer&nbsp;height,
+      java.lang.String&nbsp;passportID,
+      @NonNull <a href="../../common/data/Color.html" title="enum in common.data">Color</a>&nbsp;eyeColor,
+      @NonNull <a href="../../common/data/Country.html" title="enum in common.data">Country</a>&nbsp;nationality,
+      <a href="../../common/data/Location.html" title="class in common.data">Location</a>&nbsp;location)</code>&nbsp;</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -158,7 +168,7 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -176,28 +186,6 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
 <td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#formatted--">formatted</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#incrementExistingPeople--">incrementExistingPeople</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#setHeight-java.lang.Integer-">setHeight</a></span>(java.lang.Integer&nbsp;height)</code>
-<div class="block">Сеттер для поля height</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#setName-java.lang.String-">setName</a></span>(java.lang.String&nbsp;name)</code>
-<div class="block">Сеттер для поля name</div>
-</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#setPassportID-java.lang.String-">setPassportID</a></span>(java.lang.String&nbsp;passportID)</code>
-<div class="block">Сеттер для поля passportID</div>
-</td>
-</tr>
-<tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../common/data/Person.html#update-common.data.Person-">update</a></span>(<a href="../../common/data/Person.html" title="class in common.data">Person</a>&nbsp;newPerson)</code>
 <div class="block">Метод, меняющий все значения полей человека (кроме <a href="../../common/data/Person.html#id"><code>id</code></a> и <a href="../../common/data/Person.html#creationDate"><code>creationDate</code></a>) в соответствии
@@ -226,6 +214,40 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
+<a name="Person-long-java.lang.String-common.data.Coordinates-java.lang.Integer-java.lang.String-common.data.Color-common.data.Country-common.data.Location-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Person</h4>
+<pre>public&nbsp;Person(long&nbsp;id,
+              @NonNull
+              @NonNull java.lang.String&nbsp;name,
+              @NonNull
+              @NonNull <a href="../../common/data/Coordinates.html" title="class in common.data">Coordinates</a>&nbsp;coordinates,
+              java.lang.Integer&nbsp;height,
+              java.lang.String&nbsp;passportID,
+              @NonNull
+              @NonNull <a href="../../common/data/Color.html" title="enum in common.data">Color</a>&nbsp;eyeColor,
+              @NonNull
+              @NonNull <a href="../../common/data/Country.html" title="enum in common.data">Country</a>&nbsp;nationality,
+              <a href="../../common/data/Location.html" title="class in common.data">Location</a>&nbsp;location)</pre>
+<div class="block">Конструктор с параметрами</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - Id человека</dd>
+<dd><code>name</code> - Имя человека</dd>
+<dd><code>coordinates</code> - Координаты человека</dd>
+<dd><code>height</code> - Высота человека</dd>
+<dd><code>passportID</code> - Номер паспорта человека</dd>
+<dd><code>eyeColor</code> - Цвет глаз человека</dd>
+<dd><code>nationality</code> - Национальность человека</dd>
+<dd><code>location</code> - Местоположение человека</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.NullPointerException</code> - Если name, coordinates, eyeColor или nationality являются null</dd>
+</dl>
+</li>
+</ul>
 <a name="Person-java.lang.String-common.data.Coordinates-java.lang.Integer-java.lang.String-common.data.Color-common.data.Country-common.data.Location-">
 <!--   -->
 </a>
@@ -243,19 +265,6 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
               @NonNull
               @NonNull <a href="../../common/data/Country.html" title="enum in common.data">Country</a>&nbsp;nationality,
               <a href="../../common/data/Location.html" title="class in common.data">Location</a>&nbsp;location)</pre>
-<div class="block">Конструктор с параметрами</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - Имя человека</dd>
-<dd><code>coordinates</code> - Координаты человека</dd>
-<dd><code>height</code> - Высота человека</dd>
-<dd><code>passportID</code> - Номер паспорта человека</dd>
-<dd><code>eyeColor</code> - Цвет глаз человека</dd>
-<dd><code>nationality</code> - Национальность человека</dd>
-<dd><code>location</code> - Местоположение человека</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.NullPointerException</code> - Если name, coordinates, eyeColor или nationality являются null</dd>
-</dl>
 </li>
 </ul>
 </li>
@@ -281,57 +290,6 @@ implements java.lang.Comparable&lt;<a href="../../common/data/Person.html" title
 </dl>
 </li>
 </ul>
-<a name="incrementExistingPeople--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>incrementExistingPeople</h4>
-<pre>public static&nbsp;void&nbsp;incrementExistingPeople()</pre>
-</li>
-</ul>
-<a name="setName-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setName</h4>
-<pre>public&nbsp;void&nbsp;setName(java.lang.String&nbsp;name)</pre>
-<div class="block">Сеттер для поля name</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - Имя человека</dd>
-</dl>
-</li>
-</ul>
-<a name="setHeight-java.lang.Integer-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setHeight</h4>
-<pre>public&nbsp;void&nbsp;setHeight(java.lang.Integer&nbsp;height)</pre>
-<div class="block">Сеттер для поля height</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>height</code> - Рост человека</dd>
-</dl>
-</li>
-</ul>
-<a name="setPassportID-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setPassportID</h4>
-<pre>public&nbsp;void&nbsp;setPassportID(java.lang.String&nbsp;passportID)</pre>
-<div class="block">Сеттер для поля passportID</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>passportID</code> - Номер паспорта человека</dd>
-</dl>
-</li>
-</ul>
 <a name="formatted--">
 <!--   -->
 </a>
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-frame.html b/Lab5Core/build/docs/javadoc/common/data/package-frame.html
index db95a75..253e7c8 100644
--- a/Lab5Core/build/docs/javadoc/common/data/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/data/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.data (Lab5Core 2.2 API)</title>
+<title>common.data (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-summary.html b/Lab5Core/build/docs/javadoc/common/data/package-summary.html
index 7a971a6..f24abeb 100644
--- a/Lab5Core/build/docs/javadoc/common/data/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/data/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.data (Lab5Core 2.2 API)</title>
+<title>common.data (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.data (Lab5Core 2.2 API)";
+            parent.document.title="common.data (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../common/commandline/response/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../common/parser/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../common/net/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?common/data/package-summary.html" target="_top">Frames</a></li>
@@ -149,7 +149,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../common/commandline/response/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../common/parser/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../common/net/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?common/data/package-summary.html" target="_top">Frames</a></li>
diff --git a/Lab5Core/build/docs/javadoc/common/data/package-tree.html b/Lab5Core/build/docs/javadoc/common/data/package-tree.html
index 34a5ecc..6d6804c 100644
--- a/Lab5Core/build/docs/javadoc/common/data/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/data/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.data Class Hierarchy (Lab5Core 2.2 API)</title>
+<title>common.data Class Hierarchy (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.data Class Hierarchy (Lab5Core 2.2 API)";
+            parent.document.title="common.data Class Hierarchy (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../common/commandline/response/package-tree.html">Prev</a></li>
-<li><a href="../../common/parser/package-tree.html">Next</a></li>
+<li><a href="../../common/net/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?common/data/package-tree.html" target="_top">Frames</a></li>
@@ -91,8 +91,8 @@
 <ul>
 <li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <ul>
-<li type="circle">common.data.<a href="../../common/data/Color.html" title="enum in common.data"><span class="typeNameLink">Color</span></a> (implements java.io.Serializable)</li>
 <li type="circle">common.data.<a href="../../common/data/Country.html" title="enum in common.data"><span class="typeNameLink">Country</span></a> (implements java.io.Serializable)</li>
+<li type="circle">common.data.<a href="../../common/data/Color.html" title="enum in common.data"><span class="typeNameLink">Color</span></a> (implements java.io.Serializable)</li>
 </ul>
 </li>
 </ul>
@@ -120,7 +120,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../common/commandline/response/package-tree.html">Prev</a></li>
-<li><a href="../../common/parser/package-tree.html">Next</a></li>
+<li><a href="../../common/net/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../index.html?common/data/package-tree.html" target="_top">Frames</a></li>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.html b/Lab5Core/build/docs/javadoc/common/net/ConnectionProperties.html
similarity index 56%
rename from Lab5Core/build/docs/javadoc/common/parser/Adapters.html
rename to Lab5Core/build/docs/javadoc/common/net/ConnectionProperties.html
index e43a959..c5f85f0 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.html
+++ b/Lab5Core/build/docs/javadoc/common/net/ConnectionProperties.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Adapters (Lab5Core 2.2 API)</title>
+<title>ConnectionProperties (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,12 +11,18 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters (Lab5Core 2.2 API)";
+            parent.document.title="ConnectionProperties (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
 </script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -42,11 +48,11 @@
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../common/parser/Adapters.ColorAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.html" target="_top">Frames</a></li>
-<li><a href="Adapters.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/net/ConnectionProperties.html" target="_top">Frames</a></li>
+<li><a href="ConnectionProperties.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -66,16 +72,16 @@
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
 <li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.top">
@@ -84,15 +90,15 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">common.parser</div>
-<h2 title="Class Adapters" class="title">Class Adapters</h2>
+<div class="subTitle">common.net</div>
+<h2 title="Class ConnectionProperties" class="title">Class ConnectionProperties</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>common.parser.Adapters</li>
+<li>common.net.ConnectionProperties</li>
 </ul>
 </li>
 </ul>
@@ -101,7 +107,7 @@
 <li class="blockList">
 <hr>
 <br>
-<pre>public final class <span class="typeNameLabel">Adapters</span>
+<pre>public final class <span class="typeNameLabel">ConnectionProperties</span>
 extends java.lang.Object</pre>
 </li>
 </ul>
@@ -109,49 +115,6 @@ extends java.lang.Object</pre>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
-<!--   -->
-</a>
-<h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
-<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.ColorAdapter.html" title="class in common.parser">Adapters.ColorAdapter</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser">Adapters.CoordinateYAdapter</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.CountryAdapter.html" title="class in common.parser">Adapters.CountryAdapter</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.HeightAdapter.html" title="class in common.parser">Adapters.HeightAdapter</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser">Adapters.LocalDateAdapter</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.NameAdapter.html" title="class in common.parser">Adapters.NameAdapter</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.PassportAdapter.html" title="class in common.parser">Adapters.PassportAdapter</a></span></code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- =========== FIELD SUMMARY =========== -->
 <ul class="blockList">
 <li class="blockList"><a name="field.summary">
@@ -165,40 +128,36 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>static <a href="../../common/data/Color.html" title="enum in common.data">Color</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#DEFAULT_COLOR">DEFAULT_COLOR</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#DEFAULT_COORDINATE">DEFAULT_COORDINATE</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../common/data/Coordinates.html" title="class in common.data">Coordinates</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#DEFAULT_COORDINATES">DEFAULT_COORDINATES</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../common/data/Country.html" title="enum in common.data">Country</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#DEFAULT_COUNTRY">DEFAULT_COUNTRY</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static java.time.LocalDate</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#DEFAULT_DATE">DEFAULT_DATE</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#DEFAULT_HEIGHT">DEFAULT_HEIGHT</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../common/data/Location.html" title="class in common.data">Location</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#DEFAULT_LOCATION">DEFAULT_LOCATION</a></span></code>&nbsp;</td>
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#DEFAULT_DB_HOST">DEFAULT_DB_HOST</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#DEFAULT_NAME">DEFAULT_NAME</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#DEFAULT_DB_NAME">DEFAULT_DB_NAME</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#DEFAULT_DB_PORT">DEFAULT_DB_PORT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#DEFAULT_PASSPORT">DEFAULT_PASSPORT</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#DEFAULT_HOST">DEFAULT_HOST</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#DEFAULT_PORT">DEFAULT_PORT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#FILE_NAME">FILE_NAME</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.logging.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#logger">logger</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.util.Properties</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#properties">properties</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -215,7 +174,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.html#Adapters--">Adapters</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#ConnectionProperties--">ConnectionProperties</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -226,6 +185,33 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#getDbURL--">getDbURL</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#getHostname--">getHostname</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#getPort--">getPort</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#setHostname-java.lang.String-">setHostname</a></span>(java.lang.String&nbsp;hostname)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../common/net/ConnectionProperties.html#setPort-int-">setPort</a></span>(int&nbsp;port)</code>&nbsp;</td>
+</tr>
+</table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
@@ -247,101 +233,100 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="DEFAULT_DATE">
+<a name="properties">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>DEFAULT_DATE</h4>
-<pre>public static final&nbsp;java.time.LocalDate DEFAULT_DATE</pre>
+<h4>properties</h4>
+<pre>public static final&nbsp;java.util.Properties properties</pre>
 </li>
 </ul>
-<a name="DEFAULT_HEIGHT">
+<a name="logger">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>DEFAULT_HEIGHT</h4>
-<pre>public static final&nbsp;int DEFAULT_HEIGHT</pre>
+<h4>logger</h4>
+<pre>public static final&nbsp;java.util.logging.Logger logger</pre>
+</li>
+</ul>
+<a name="DEFAULT_PORT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DEFAULT_PORT</h4>
+<pre>public static final&nbsp;int DEFAULT_PORT</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../constant-values.html#common.parser.Adapters.DEFAULT_HEIGHT">Constant Field Values</a></dd>
+<dd><a href="../../constant-values.html#common.net.ConnectionProperties.DEFAULT_PORT">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
-<a name="DEFAULT_COLOR">
+<a name="DEFAULT_DB_PORT">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>DEFAULT_COLOR</h4>
-<pre>public static final&nbsp;<a href="../../common/data/Color.html" title="enum in common.data">Color</a> DEFAULT_COLOR</pre>
-</li>
-</ul>
-<a name="DEFAULT_COUNTRY">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DEFAULT_COUNTRY</h4>
-<pre>public static final&nbsp;<a href="../../common/data/Country.html" title="enum in common.data">Country</a> DEFAULT_COUNTRY</pre>
-</li>
-</ul>
-<a name="DEFAULT_NAME">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DEFAULT_NAME</h4>
-<pre>public static final&nbsp;java.lang.String DEFAULT_NAME</pre>
+<h4>DEFAULT_DB_PORT</h4>
+<pre>public static final&nbsp;int DEFAULT_DB_PORT</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../constant-values.html#common.parser.Adapters.DEFAULT_NAME">Constant Field Values</a></dd>
+<dd><a href="../../constant-values.html#common.net.ConnectionProperties.DEFAULT_DB_PORT">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
-<a name="DEFAULT_PASSPORT">
+<a name="DEFAULT_HOST">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>DEFAULT_PASSPORT</h4>
-<pre>public static final&nbsp;java.lang.String DEFAULT_PASSPORT</pre>
+<h4>DEFAULT_HOST</h4>
+<pre>public static final&nbsp;java.lang.String DEFAULT_HOST</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../constant-values.html#common.parser.Adapters.DEFAULT_PASSPORT">Constant Field Values</a></dd>
+<dd><a href="../../constant-values.html#common.net.ConnectionProperties.DEFAULT_HOST">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
-<a name="DEFAULT_COORDINATE">
+<a name="DEFAULT_DB_HOST">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>DEFAULT_COORDINATE</h4>
-<pre>public static final&nbsp;int DEFAULT_COORDINATE</pre>
+<h4>DEFAULT_DB_HOST</h4>
+<pre>public static final&nbsp;java.lang.String DEFAULT_DB_HOST</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../constant-values.html#common.parser.Adapters.DEFAULT_COORDINATE">Constant Field Values</a></dd>
+<dd><a href="../../constant-values.html#common.net.ConnectionProperties.DEFAULT_DB_HOST">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
-<a name="DEFAULT_COORDINATES">
+<a name="DEFAULT_DB_NAME">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>DEFAULT_COORDINATES</h4>
-<pre>public static final&nbsp;<a href="../../common/data/Coordinates.html" title="class in common.data">Coordinates</a> DEFAULT_COORDINATES</pre>
+<h4>DEFAULT_DB_NAME</h4>
+<pre>public static final&nbsp;java.lang.String DEFAULT_DB_NAME</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#common.net.ConnectionProperties.DEFAULT_DB_NAME">Constant Field Values</a></dd>
+</dl>
 </li>
 </ul>
-<a name="DEFAULT_LOCATION">
+<a name="FILE_NAME">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>DEFAULT_LOCATION</h4>
-<pre>public static final&nbsp;<a href="../../common/data/Location.html" title="class in common.data">Location</a> DEFAULT_LOCATION</pre>
+<h4>FILE_NAME</h4>
+<pre>public static final&nbsp;java.lang.String FILE_NAME</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../constant-values.html#common.net.ConnectionProperties.FILE_NAME">Constant Field Values</a></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -352,13 +337,66 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="Adapters--">
+<a name="ConnectionProperties--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>Adapters</h4>
-<pre>public&nbsp;Adapters()</pre>
+<h4>ConnectionProperties</h4>
+<pre>public&nbsp;ConnectionProperties()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getHostname--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getHostname</h4>
+<pre>public static&nbsp;java.lang.String&nbsp;getHostname()</pre>
+</li>
+</ul>
+<a name="setHostname-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setHostname</h4>
+<pre>public static&nbsp;void&nbsp;setHostname(java.lang.String&nbsp;hostname)</pre>
+</li>
+</ul>
+<a name="getPort--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPort</h4>
+<pre>public static&nbsp;int&nbsp;getPort()</pre>
+</li>
+</ul>
+<a name="setPort-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPort</h4>
+<pre>public static&nbsp;void&nbsp;setPort(int&nbsp;port)</pre>
+</li>
+</ul>
+<a name="getDbURL--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getDbURL</h4>
+<pre>public static&nbsp;java.lang.String&nbsp;getDbURL()</pre>
 </li>
 </ul>
 </li>
@@ -389,11 +427,11 @@ extends java.lang.Object</pre>
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../common/parser/Adapters.ColorAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.html" target="_top">Frames</a></li>
-<li><a href="Adapters.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?common/net/ConnectionProperties.html" target="_top">Frames</a></li>
+<li><a href="ConnectionProperties.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -413,16 +451,16 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
 <li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#methods.inherited.from.class.java.lang.Object">Method</a></li>
+<li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
 <a name="skip.navbar.bottom">
diff --git a/Lab5Core/build/docs/javadoc/common/net/package-frame.html b/Lab5Core/build/docs/javadoc/common/net/package-frame.html
new file mode 100644
index 0000000..9cb13fb
--- /dev/null
+++ b/Lab5Core/build/docs/javadoc/common/net/package-frame.html
@@ -0,0 +1,19 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>common.net (Lab5Core 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../common/net/package-summary.html" target="classFrame">common.net</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="ConnectionProperties.html" title="class in common.net" target="classFrame">ConnectionProperties</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/package-summary.html b/Lab5Core/build/docs/javadoc/common/net/package-summary.html
similarity index 65%
rename from Lab5Core/build/docs/javadoc/common/parser/package-summary.html
rename to Lab5Core/build/docs/javadoc/common/net/package-summary.html
index c9414f2..d4055b8 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/net/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.parser (Lab5Core 2.2 API)</title>
+<title>common.net (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.parser (Lab5Core 2.2 API)";
+            parent.document.title="common.net (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -45,7 +45,7 @@
 <li><a href="../../common/util/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../index.html?common/net/package-summary.html" target="_top">Frames</a></li>
 <li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 title="Package" class="title">Package&nbsp;common.parser</h1>
+<h1 title="Package" class="title">Package&nbsp;common.net</h1>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
@@ -81,39 +81,7 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../common/parser/Adapters.html" title="class in common.parser">Adapters</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../common/parser/Adapters.ColorAdapter.html" title="class in common.parser">Adapters.ColorAdapter</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser">Adapters.CoordinateYAdapter</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../common/parser/Adapters.CountryAdapter.html" title="class in common.parser">Adapters.CountryAdapter</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../common/parser/Adapters.HeightAdapter.html" title="class in common.parser">Adapters.HeightAdapter</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser">Adapters.LocalDateAdapter</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../common/parser/Adapters.NameAdapter.html" title="class in common.parser">Adapters.NameAdapter</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../common/parser/Adapters.PassportAdapter.html" title="class in common.parser">Adapters.PassportAdapter</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../common/parser/ConnectionProperties.html" title="class in common.parser">ConnectionProperties</a></td>
+<td class="colFirst"><a href="../../common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>
@@ -145,7 +113,7 @@
 <li><a href="../../common/util/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../index.html?common/net/package-summary.html" target="_top">Frames</a></li>
 <li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/Lab5Core/build/docs/javadoc/common/parser/package-tree.html b/Lab5Core/build/docs/javadoc/common/net/package-tree.html
similarity index 63%
rename from Lab5Core/build/docs/javadoc/common/parser/package-tree.html
rename to Lab5Core/build/docs/javadoc/common/net/package-tree.html
index 344fc6e..f620368 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/net/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.parser Class Hierarchy (Lab5Core 2.2 API)</title>
+<title>common.net Class Hierarchy (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.parser Class Hierarchy (Lab5Core 2.2 API)";
+            parent.document.title="common.net Class Hierarchy (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -45,7 +45,7 @@
 <li><a href="../../common/util/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../index.html?common/net/package-tree.html" target="_top">Frames</a></li>
 <li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Hierarchy For Package common.parser</h1>
+<h1 class="title">Hierarchy For Package common.net</h1>
 <span class="packageHierarchyLabel">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="../../overview-tree.html">All Packages</a></li>
@@ -79,19 +79,7 @@
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">common.parser.<a href="../../common/parser/Adapters.html" title="class in common.parser"><span class="typeNameLink">Adapters</span></a></li>
-<li type="circle">common.parser.<a href="../../common/parser/ConnectionProperties.html" title="class in common.parser"><span class="typeNameLink">ConnectionProperties</span></a></li>
-<li type="circle">javax.xml.bind.annotation.adapters.XmlAdapter&lt;ValueType,BoundType&gt;
-<ul>
-<li type="circle">common.parser.<a href="../../common/parser/Adapters.ColorAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.ColorAdapter</span></a></li>
-<li type="circle">common.parser.<a href="../../common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.CoordinateYAdapter</span></a></li>
-<li type="circle">common.parser.<a href="../../common/parser/Adapters.CountryAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.CountryAdapter</span></a></li>
-<li type="circle">common.parser.<a href="../../common/parser/Adapters.HeightAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.HeightAdapter</span></a></li>
-<li type="circle">common.parser.<a href="../../common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.LocalDateAdapter</span></a></li>
-<li type="circle">common.parser.<a href="../../common/parser/Adapters.NameAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.NameAdapter</span></a></li>
-<li type="circle">common.parser.<a href="../../common/parser/Adapters.PassportAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.PassportAdapter</span></a></li>
-</ul>
-</li>
+<li type="circle">common.net.<a href="../../common/net/ConnectionProperties.html" title="class in common.net"><span class="typeNameLink">ConnectionProperties</span></a></li>
 </ul>
 </li>
 </ul>
@@ -120,7 +108,7 @@
 <li><a href="../../common/util/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../index.html?common/net/package-tree.html" target="_top">Frames</a></li>
 <li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.LocalDateAdapter.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.LocalDateAdapter.html
deleted file mode 100644
index 728bcf0..0000000
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.LocalDateAdapter.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="ru">
-<head>
-<!-- Generated by javadoc -->
-<title>Adapters.LocalDateAdapter (Lab5Core 2.2 API)</title>
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.LocalDateAdapter (Lab5Core 2.2 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../common/parser/Adapters.HeightAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.NameAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.LocalDateAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.LocalDateAdapter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">common.parser</div>
-<h2 title="Class Adapters.LocalDateAdapter" class="title">Class Adapters.LocalDateAdapter</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.time.LocalDate&gt;</li>
-<li>
-<ul class="inheritance">
-<li>common.parser.Adapters.LocalDateAdapter</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../../common/parser/Adapters.html" title="class in common.parser">Adapters</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public static class <span class="typeNameLabel">Adapters.LocalDateAdapter</span>
-extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.time.LocalDate&gt;</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.LocalDateAdapter.html#LocalDateAdapter--">LocalDateAdapter</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.LocalDateAdapter.html#marshal-java.time.LocalDate-">marshal</a></span>(java.time.LocalDate&nbsp;v)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.time.LocalDate</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.LocalDateAdapter.html#unmarshal-java.lang.String-">unmarshal</a></span>(java.lang.String&nbsp;v)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="LocalDateAdapter--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>LocalDateAdapter</h4>
-<pre>public&nbsp;LocalDateAdapter()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="unmarshal-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unmarshal</h4>
-<pre>public&nbsp;java.time.LocalDate&nbsp;unmarshal(java.lang.String&nbsp;v)
-                              throws java.lang.Exception</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>unmarshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.time.LocalDate&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
-</dl>
-</li>
-</ul>
-<a name="marshal-java.time.LocalDate-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>marshal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;marshal(java.time.LocalDate&nbsp;v)
-                         throws java.lang.Exception</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>marshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.time.LocalDate&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../common/parser/Adapters.HeightAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/Adapters.NameAdapter.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.LocalDateAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.LocalDateAdapter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/Adapters.PassportAdapter.html b/Lab5Core/build/docs/javadoc/common/parser/Adapters.PassportAdapter.html
deleted file mode 100644
index 7e0e817..0000000
--- a/Lab5Core/build/docs/javadoc/common/parser/Adapters.PassportAdapter.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="ru">
-<head>
-<!-- Generated by javadoc -->
-<title>Adapters.PassportAdapter (Lab5Core 2.2 API)</title>
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Adapters.PassportAdapter (Lab5Core 2.2 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../common/parser/Adapters.NameAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/ConnectionProperties.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.PassportAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.PassportAdapter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">common.parser</div>
-<h2 title="Class Adapters.PassportAdapter" class="title">Class Adapters.PassportAdapter</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.String&gt;</li>
-<li>
-<ul class="inheritance">
-<li>common.parser.Adapters.PassportAdapter</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Enclosing class:</dt>
-<dd><a href="../../common/parser/Adapters.html" title="class in common.parser">Adapters</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public static class <span class="typeNameLabel">Adapters.PassportAdapter</span>
-extends javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.String&gt;</pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.PassportAdapter.html#PassportAdapter--">PassportAdapter</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.PassportAdapter.html#marshal-java.lang.String-">marshal</a></span>(java.lang.String&nbsp;v)</code>&nbsp;</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/Adapters.PassportAdapter.html#unmarshal-java.lang.String-">unmarshal</a></span>(java.lang.String&nbsp;v)</code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="PassportAdapter--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>PassportAdapter</h4>
-<pre>public&nbsp;PassportAdapter()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="unmarshal-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unmarshal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;unmarshal(java.lang.String&nbsp;v)
-                           throws java.lang.Exception</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>unmarshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.String&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
-</dl>
-</li>
-</ul>
-<a name="marshal-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>marshal</h4>
-<pre>public&nbsp;java.lang.String&nbsp;marshal(java.lang.String&nbsp;v)
-                         throws java.lang.Exception</pre>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>marshal</code>&nbsp;in class&nbsp;<code>javax.xml.bind.annotation.adapters.XmlAdapter&lt;java.lang.String,java.lang.String&gt;</code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.lang.Exception</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-<li><a href="../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../common/parser/Adapters.NameAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../common/parser/ConnectionProperties.html" title="class in common.parser"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?common/parser/Adapters.PassportAdapter.html" target="_top">Frames</a></li>
-<li><a href="Adapters.PassportAdapter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/Lab5Core/build/docs/javadoc/common/parser/package-frame.html b/Lab5Core/build/docs/javadoc/common/parser/package-frame.html
deleted file mode 100644
index 4b578dc..0000000
--- a/Lab5Core/build/docs/javadoc/common/parser/package-frame.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="ru">
-<head>
-<!-- Generated by javadoc -->
-<title>common.parser (Lab5Core 2.2 API)</title>
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../../common/parser/package-summary.html" target="classFrame">common.parser</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="Adapters.html" title="class in common.parser" target="classFrame">Adapters</a></li>
-<li><a href="Adapters.ColorAdapter.html" title="class in common.parser" target="classFrame">Adapters.ColorAdapter</a></li>
-<li><a href="Adapters.CoordinateYAdapter.html" title="class in common.parser" target="classFrame">Adapters.CoordinateYAdapter</a></li>
-<li><a href="Adapters.CountryAdapter.html" title="class in common.parser" target="classFrame">Adapters.CountryAdapter</a></li>
-<li><a href="Adapters.HeightAdapter.html" title="class in common.parser" target="classFrame">Adapters.HeightAdapter</a></li>
-<li><a href="Adapters.LocalDateAdapter.html" title="class in common.parser" target="classFrame">Adapters.LocalDateAdapter</a></li>
-<li><a href="Adapters.NameAdapter.html" title="class in common.parser" target="classFrame">Adapters.NameAdapter</a></li>
-<li><a href="Adapters.PassportAdapter.html" title="class in common.parser" target="classFrame">Adapters.PassportAdapter</a></li>
-<li><a href="ConnectionProperties.html" title="class in common.parser" target="classFrame">ConnectionProperties</a></li>
-</ul>
-</div>
-</body>
-</html>
diff --git a/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html b/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html
index 689eca1..b4a6076 100644
--- a/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html
+++ b/Lab5Core/build/docs/javadoc/common/util/UtilFunctions.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>UtilFunctions (Lab5Core 2.2 API)</title>
+<title>UtilFunctions (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UtilFunctions (Lab5Core 2.2 API)";
+            parent.document.title="UtilFunctions (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/util/package-frame.html b/Lab5Core/build/docs/javadoc/common/util/package-frame.html
index 3ae592a..c4db2dd 100644
--- a/Lab5Core/build/docs/javadoc/common/util/package-frame.html
+++ b/Lab5Core/build/docs/javadoc/common/util/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.util (Lab5Core 2.2 API)</title>
+<title>common.util (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Core/build/docs/javadoc/common/util/package-summary.html b/Lab5Core/build/docs/javadoc/common/util/package-summary.html
index 1c0a4ee..12e03ef 100644
--- a/Lab5Core/build/docs/javadoc/common/util/package-summary.html
+++ b/Lab5Core/build/docs/javadoc/common/util/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.util (Lab5Core 2.2 API)</title>
+<title>common.util (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.util (Lab5Core 2.2 API)";
+            parent.document.title="common.util (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -41,7 +41,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../common/net/package-summary.html">Prev&nbsp;Package</a></li>
 <li>Next&nbsp;Package</li>
 </ul>
 <ul class="navList">
@@ -111,7 +111,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../common/net/package-summary.html">Prev&nbsp;Package</a></li>
 <li>Next&nbsp;Package</li>
 </ul>
 <ul class="navList">
diff --git a/Lab5Core/build/docs/javadoc/common/util/package-tree.html b/Lab5Core/build/docs/javadoc/common/util/package-tree.html
index 93cac1f..f8630f8 100644
--- a/Lab5Core/build/docs/javadoc/common/util/package-tree.html
+++ b/Lab5Core/build/docs/javadoc/common/util/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>common.util Class Hierarchy (Lab5Core 2.2 API)</title>
+<title>common.util Class Hierarchy (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="common.util Class Hierarchy (Lab5Core 2.2 API)";
+            parent.document.title="common.util Class Hierarchy (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -41,7 +41,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/package-tree.html">Prev</a></li>
+<li><a href="../../common/net/package-tree.html">Prev</a></li>
 <li>Next</li>
 </ul>
 <ul class="navList">
@@ -104,7 +104,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/package-tree.html">Prev</a></li>
+<li><a href="../../common/net/package-tree.html">Prev</a></li>
 <li>Next</li>
 </ul>
 <ul class="navList">
diff --git a/Lab5Core/build/docs/javadoc/constant-values.html b/Lab5Core/build/docs/javadoc/constant-values.html
index 579bb9a..f84e4b8 100644
--- a/Lab5Core/build/docs/javadoc/constant-values.html
+++ b/Lab5Core/build/docs/javadoc/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (Lab5Core 2.2 API)</title>
+<title>Constant Field Values (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (Lab5Core 2.2 API)";
+            parent.document.title="Constant Field Values (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -71,17 +71,17 @@
 <h1 title="Constant Field Values" class="title">Constant Field Values</h1>
 <h2 title="Contents">Contents</h2>
 <ul>
-<li><a href="#common.parser">common.parser.*</a></li>
+<li><a href="#common.net">common.net.*</a></li>
 </ul>
 </div>
-<div class="constantValuesContainer"><a name="common.parser">
+<div class="constantValuesContainer"><a name="common.net">
 <!--   -->
 </a>
-<h2 title="common.parser">common.parser.*</h2>
+<h2 title="common.net">common.net.*</h2>
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
-<caption><span>common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th scope="col">Constant Field</th>
@@ -89,32 +89,46 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a name="common.parser.Adapters.DEFAULT_COORDINATE">
+<td class="colFirst"><a name="common.net.ConnectionProperties.DEFAULT_DB_HOST">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="common/parser/Adapters.html#DEFAULT_COORDINATE">DEFAULT_COORDINATE</a></code></td>
-<td class="colLast"><code>0</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
+<td><code><a href="common/net/ConnectionProperties.html#DEFAULT_DB_HOST">DEFAULT_DB_HOST</a></code></td>
+<td class="colLast"><code>"pg"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="common.parser.Adapters.DEFAULT_HEIGHT">
+<td class="colFirst"><a name="common.net.ConnectionProperties.DEFAULT_DB_NAME">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
-<td><code><a href="common/parser/Adapters.html#DEFAULT_HEIGHT">DEFAULT_HEIGHT</a></code></td>
-<td class="colLast"><code>150</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
+<td><code><a href="common/net/ConnectionProperties.html#DEFAULT_DB_NAME">DEFAULT_DB_NAME</a></code></td>
+<td class="colLast"><code>"studs"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="common.parser.Adapters.DEFAULT_NAME">
+<td class="colFirst"><a name="common.net.ConnectionProperties.DEFAULT_DB_PORT">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
-<td><code><a href="common/parser/Adapters.html#DEFAULT_NAME">DEFAULT_NAME</a></code></td>
-<td class="colLast"><code>"name"</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="common/net/ConnectionProperties.html#DEFAULT_DB_PORT">DEFAULT_DB_PORT</a></code></td>
+<td class="colLast"><code>5432</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="common.parser.Adapters.DEFAULT_PASSPORT">
+<td class="colFirst"><a name="common.net.ConnectionProperties.DEFAULT_HOST">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
-<td><code><a href="common/parser/Adapters.html#DEFAULT_PASSPORT">DEFAULT_PASSPORT</a></code></td>
-<td class="colLast"><code>"passport"</code></td>
+<td><code><a href="common/net/ConnectionProperties.html#DEFAULT_HOST">DEFAULT_HOST</a></code></td>
+<td class="colLast"><code>"localhost"</code></td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a name="common.net.ConnectionProperties.DEFAULT_PORT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="common/net/ConnectionProperties.html#DEFAULT_PORT">DEFAULT_PORT</a></code></td>
+<td class="colLast"><code>1234</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="common.net.ConnectionProperties.FILE_NAME">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
+<td><code><a href="common/net/ConnectionProperties.html#FILE_NAME">FILE_NAME</a></code></td>
+<td class="colLast"><code>"connection.properties"</code></td>
 </tr>
 </tbody>
 </table>
diff --git a/Lab5Core/build/docs/javadoc/deprecated-list.html b/Lab5Core/build/docs/javadoc/deprecated-list.html
index 42da9ab..2de75b1 100644
--- a/Lab5Core/build/docs/javadoc/deprecated-list.html
+++ b/Lab5Core/build/docs/javadoc/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (Lab5Core 2.2 API)</title>
+<title>Deprecated List (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (Lab5Core 2.2 API)";
+            parent.document.title="Deprecated List (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/help-doc.html b/Lab5Core/build/docs/javadoc/help-doc.html
index 94223cf..77c9de4 100644
--- a/Lab5Core/build/docs/javadoc/help-doc.html
+++ b/Lab5Core/build/docs/javadoc/help-doc.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (Lab5Core 2.2 API)</title>
+<title>API Help (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (Lab5Core 2.2 API)";
+            parent.document.title="API Help (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/index-all.html b/Lab5Core/build/docs/javadoc/index-all.html
index 5cd5655..d774324 100644
--- a/Lab5Core/build/docs/javadoc/index-all.html
+++ b/Lab5Core/build/docs/javadoc/index-all.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (Lab5Core 2.2 API)</title>
+<title>Index (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (Lab5Core 2.2 API)";
+            parent.document.title="Index (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -67,29 +67,11 @@
 <!--   -->
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
-<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a name="I:A">
+<div class="contentContainer"><a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a name="I:A">
 <!--   -->
 </a>
 <h2 class="title">A</h2>
 <dl>
-<dt><a href="common/parser/Adapters.html" title="class in common.parser"><span class="typeNameLink">Adapters</span></a> - Class in <a href="common/parser/package-summary.html">common.parser</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#Adapters--">Adapters()</a></span> - Constructor for class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="common/parser/Adapters.ColorAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.ColorAdapter</span></a> - Class in <a href="common/parser/package-summary.html">common.parser</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.CoordinateYAdapter</span></a> - Class in <a href="common/parser/package-summary.html">common.parser</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="common/parser/Adapters.CountryAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.CountryAdapter</span></a> - Class in <a href="common/parser/package-summary.html">common.parser</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="common/parser/Adapters.HeightAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.HeightAdapter</span></a> - Class in <a href="common/parser/package-summary.html">common.parser</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.LocalDateAdapter</span></a> - Class in <a href="common/parser/package-summary.html">common.parser</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="common/parser/Adapters.NameAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.NameAdapter</span></a> - Class in <a href="common/parser/package-summary.html">common.parser</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="common/parser/Adapters.PassportAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.PassportAdapter</span></a> - Class in <a href="common/parser/package-summary.html">common.parser</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.html#addNewInput-java.io.Reader-java.lang.String-">addNewInput(Reader, String)</a></span> - Method in class common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/Command.html#alias">alias</a></span> - Variable in class common.commandline.<a href="common/commandline/Command.html" title="class in common.commandline">Command</a></dt>
@@ -129,8 +111,6 @@
 <dd>
 <div class="block">Перечисление цветов</div>
 </dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.ColorAdapter.html#ColorAdapter--">ColorAdapter()</a></span> - Constructor for class common.parser.<a href="common/parser/Adapters.ColorAdapter.html" title="class in common.parser">Adapters.ColorAdapter</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="common/commandline/Command.html" title="class in common.commandline"><span class="typeNameLink">Command</span></a> - Class in <a href="common/commandline/package-summary.html">common.commandline</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/Command.html#Command-java.lang.String-boolean-java.lang.String-">Command(String, boolean, String)</a></span> - Constructor for class common.commandline.<a href="common/commandline/Command.html" title="class in common.commandline">Command</a></dt>
@@ -153,8 +133,6 @@
 <dd>&nbsp;</dd>
 <dt><a href="common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.HistoryCommand</span></a> - Class in <a href="common/commandline/package-summary.html">common.commandline</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="common/commandline/CommandLineHandler.SaveCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.SaveCommand</span></a> - Class in <a href="common/commandline/package-summary.html">common.commandline</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.CommandLineNotInitialized.html#CommandLineNotInitialized--">CommandLineNotInitialized()</a></span> - Constructor for exception common.commandline.<a href="common/commandline/CommandLineHandler.CommandLineNotInitialized.html" title="class in common.commandline">CommandLineHandler.CommandLineNotInitialized</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.CommandLineNotInitialized.html#CommandLineNotInitialized-java.lang.String-">CommandLineNotInitialized(String)</a></span> - Constructor for exception common.commandline.<a href="common/commandline/CommandLineHandler.CommandLineNotInitialized.html" title="class in common.commandline">CommandLineHandler.CommandLineNotInitialized</a></dt>
@@ -183,7 +161,7 @@
 <dd>&nbsp;</dd>
 <dt><a href="common/data/package-summary.html">common.data</a> - package common.data</dt>
 <dd>&nbsp;</dd>
-<dt><a href="common/parser/package-summary.html">common.parser</a> - package common.parser</dt>
+<dt><a href="common/net/package-summary.html">common.net</a> - package common.net</dt>
 <dd>&nbsp;</dd>
 <dt><a href="common/util/package-summary.html">common.util</a> - package common.util</dt>
 <dd>&nbsp;</dd>
@@ -200,9 +178,9 @@
  сравнение производится по имени, номеру паспорта,
  росту, национальности, местоположению и цвету глаз</div>
 </dd>
-<dt><a href="common/parser/ConnectionProperties.html" title="class in common.parser"><span class="typeNameLink">ConnectionProperties</span></a> - Class in <a href="common/parser/package-summary.html">common.parser</a></dt>
+<dt><a href="common/net/ConnectionProperties.html" title="class in common.net"><span class="typeNameLink">ConnectionProperties</span></a> - Class in <a href="common/net/package-summary.html">common.net</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/ConnectionProperties.html#ConnectionProperties--">ConnectionProperties()</a></span> - Constructor for class common.parser.<a href="common/parser/ConnectionProperties.html" title="class in common.parser">ConnectionProperties</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#ConnectionProperties--">ConnectionProperties()</a></span> - Constructor for class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="common/data/Coordinates.html" title="class in common.data"><span class="typeNameLink">Coordinates</span></a> - Class in <a href="common/data/package-summary.html">common.data</a></dt>
 <dd>
@@ -212,14 +190,10 @@
 <dd>
 <div class="block">Конструктор с параметрами</div>
 </dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.CoordinateYAdapter.html#CoordinateYAdapter--">CoordinateYAdapter()</a></span> - Constructor for class common.parser.<a href="common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser">Adapters.CoordinateYAdapter</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="common/data/Country.html" title="enum in common.data"><span class="typeNameLink">Country</span></a> - Enum in <a href="common/data/package-summary.html">common.data</a></dt>
 <dd>
 <div class="block">Перечисление стран</div>
 </dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.CountryAdapter.html#CountryAdapter--">CountryAdapter()</a></span> - Constructor for class common.parser.<a href="common/parser/Adapters.CountryAdapter.html" title="class in common.parser">Adapters.CountryAdapter</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/pdcommands/PeopleDatabaseCommands.html#createCoordinates--">createCoordinates()</a></span> - Static method in class common.commandline.pdcommands.<a href="common/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in common.commandline.pdcommands">PeopleDatabaseCommands</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/pdcommands/PeopleDatabaseCommands.html#createLocation--">createLocation()</a></span> - Static method in class common.commandline.pdcommands.<a href="common/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in common.commandline.pdcommands">PeopleDatabaseCommands</a></dt>
@@ -232,51 +206,15 @@
 </a>
 <h2 class="title">D</h2>
 <dl>
-<dt><a href="common/collection/Database.html" title="interface in common.collection"><span class="typeNameLink">Database</span></a> - Interface in <a href="common/collection/package-summary.html">common.collection</a></dt>
-<dd>
-<div class="block">Интерфейс баз данных с методами <a href="common/collection/Database.html#load--"><code>Database.load()</code></a> и <a href="common/collection/Database.html#save--"><code>Database.save()</code></a></div>
-</dd>
-<dt><a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection"><span class="typeNameLink">Database.DatabaseLoadFailedException</span></a> - Exception in <a href="common/collection/package-summary.html">common.collection</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#DEFAULT_DB_HOST">DEFAULT_DB_HOST</a></span> - Static variable in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection"><span class="typeNameLink">Database.DatabaseSaveFailedException</span></a> - Exception in <a href="common/collection/package-summary.html">common.collection</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#DEFAULT_DB_NAME">DEFAULT_DB_NAME</a></span> - Static variable in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.String-">DatabaseLoadFailedException(String)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#DEFAULT_DB_PORT">DEFAULT_DB_PORT</a></span> - Static variable in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.String-java.lang.String-">DatabaseLoadFailedException(String, String)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#DEFAULT_HOST">DEFAULT_HOST</a></span> - Static variable in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.String-java.lang.Throwable-">DatabaseLoadFailedException(String, Throwable)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.String-java.lang.String-java.lang.Throwable-">DatabaseLoadFailedException(String, String, Throwable)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseLoadFailedException.html#DatabaseLoadFailedException-java.lang.Throwable-">DatabaseLoadFailedException(Throwable)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">Database.DatabaseLoadFailedException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.String-">DatabaseSaveFailedException(String)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.String-java.lang.String-">DatabaseSaveFailedException(String, String)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.String-java.lang.Throwable-">DatabaseSaveFailedException(String, Throwable)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.String-java.lang.String-java.lang.Throwable-">DatabaseSaveFailedException(String, String, Throwable)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/Database.DatabaseSaveFailedException.html#DatabaseSaveFailedException-java.lang.Throwable-">DatabaseSaveFailedException(Throwable)</a></span> - Constructor for exception common.collection.<a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">Database.DatabaseSaveFailedException</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#DEFAULT_COLOR">DEFAULT_COLOR</a></span> - Static variable in class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#DEFAULT_COORDINATE">DEFAULT_COORDINATE</a></span> - Static variable in class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#DEFAULT_COORDINATES">DEFAULT_COORDINATES</a></span> - Static variable in class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#DEFAULT_COUNTRY">DEFAULT_COUNTRY</a></span> - Static variable in class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#DEFAULT_DATE">DEFAULT_DATE</a></span> - Static variable in class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#DEFAULT_HEIGHT">DEFAULT_HEIGHT</a></span> - Static variable in class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#DEFAULT_LOCATION">DEFAULT_LOCATION</a></span> - Static variable in class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#DEFAULT_NAME">DEFAULT_NAME</a></span> - Static variable in class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.html#DEFAULT_PASSPORT">DEFAULT_PASSPORT</a></span> - Static variable in class common.parser.<a href="common/parser/Adapters.html" title="class in common.parser">Adapters</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#DEFAULT_PORT">DEFAULT_PORT</a></span> - Static variable in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="common/commandline/response/DefaultResponse.html" title="enum in common.commandline.response"><span class="typeNameLink">DefaultResponse</span></a> - Enum in <a href="common/commandline/response/package-summary.html">common.commandline.response</a></dt>
 <dd>&nbsp;</dd>
@@ -296,6 +234,8 @@
 <dd>&nbsp;</dd>
 <dt><a href="common/commandline/Executable.html" title="interface in common.commandline"><span class="typeNameLink">Executable</span></a> - Interface in <a href="common/commandline/package-summary.html">common.commandline</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="common/commandline/Executables.html#executable">executable</a></span> - Variable in enum common.commandline.<a href="common/commandline/Executables.html" title="enum in common.commandline">Executables</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="common/commandline/Executables.html" title="enum in common.commandline"><span class="typeNameLink">Executables</span></a> - Enum in <a href="common/commandline/package-summary.html">common.commandline</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/Executable.html#execute-java.lang.Object:A-">execute(Object[])</a></span> - Method in interface common.commandline.<a href="common/commandline/Executable.html" title="interface in common.commandline">Executable</a></dt>
@@ -320,6 +260,8 @@
 </a>
 <h2 class="title">F</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#FILE_NAME">FILE_NAME</a></span> - Static variable in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.html#fileNames">fileNames</a></span> - Variable in class common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/util/UtilFunctions.html#floatOrNull-java.lang.String-">floatOrNull(String)</a></span> - Static method in class common.util.<a href="common/util/UtilFunctions.html" title="class in common.util">UtilFunctions</a></dt>
@@ -334,9 +276,9 @@
 <dl>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandRegistry.html#getCommand-java.lang.String-">getCommand(String)</a></span> - Static method in class common.commandline.<a href="common/commandline/CommandRegistry.html" title="class in common.commandline">CommandRegistry</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/commandline/Executables.html#getExecutable--">getExecutable()</a></span> - Method in enum common.commandline.<a href="common/commandline/Executables.html" title="enum in common.commandline">Executables</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#getDbURL--">getDbURL()</a></span> - Static method in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/ConnectionProperties.html#getHostname--">getHostname()</a></span> - Static method in class common.parser.<a href="common/parser/ConnectionProperties.html" title="class in common.parser">ConnectionProperties</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#getHostname--">getHostname()</a></span> - Static method in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.html#getInstance--">getInstance()</a></span> - Static method in class common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dt>
 <dd>&nbsp;</dd>
@@ -348,7 +290,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/response/Response.html#getMsg--">getMsg()</a></span> - Method in interface common.commandline.response.<a href="common/commandline/response/Response.html" title="interface in common.commandline.response">Response</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/ConnectionProperties.html#getPort--">getPort()</a></span> - Static method in class common.parser.<a href="common/parser/ConnectionProperties.html" title="class in common.parser">ConnectionProperties</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#getPort--">getPort()</a></span> - Static method in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/response/CommandResult.html#getResponse--">getResponse()</a></span> - Method in class common.commandline.response.<a href="common/commandline/response/CommandResult.html" title="class in common.commandline.response">CommandResult</a></dt>
 <dd>&nbsp;</dd>
@@ -362,8 +304,6 @@
 </a>
 <h2 class="title">H</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.HeightAdapter.html#HeightAdapter--">HeightAdapter()</a></span> - Constructor for class common.parser.<a href="common/parser/Adapters.HeightAdapter.html" title="class in common.parser">Adapters.HeightAdapter</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandRegistry.HelpCommand.html#HelpCommand--">HelpCommand()</a></span> - Constructor for class common.commandline.<a href="common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline">CommandRegistry.HelpCommand</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.html#history">history</a></span> - Variable in class common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dt>
@@ -380,10 +320,10 @@
 </a>
 <h2 class="title">I</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="common/data/Person.html#incrementExistingPeople--">incrementExistingPeople()</a></span> - Static method in class common.data.<a href="common/data/Person.html" title="class in common.data">Person</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/collection/PeopleDatabase.html#info--">info()</a></span> - Method in class common.collection.<a href="common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="common/collection/PeopleDatabase.html#initFromDatabase-java.lang.String-java.lang.String-java.lang.String-">initFromDatabase(String, String, String)</a></span> - Method in class common.collection.<a href="common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.html#input--">input()</a></span> - Method in class common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.html#inputs">inputs</a></span> - Variable in class common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dt>
@@ -402,15 +342,6 @@
 </a>
 <h2 class="title">L</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="common/collection/Database.html#load--">load()</a></span> - Method in interface common.collection.<a href="common/collection/Database.html" title="interface in common.collection">Database</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/PeopleDatabase.html#load--">load()</a></span> - Method in class common.collection.<a href="common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></dt>
-<dd>
-<div class="block">Метод, инициализирующий базу данных из файла, находящемся по пути, указанном в
- переменной окружения <a href="common/collection/PeopleDatabase.html#ENV_VAR"><code>PeopleDatabase.ENV_VAR</code></a></div>
-</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.LocalDateAdapter.html#LocalDateAdapter--">LocalDateAdapter()</a></span> - Constructor for class common.parser.<a href="common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser">Adapters.LocalDateAdapter</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="common/data/Location.html" title="class in common.data"><span class="typeNameLink">Location</span></a> - Class in <a href="common/data/package-summary.html">common.data</a></dt>
 <dd>
 <div class="block">Класс данных местоположения, реализует сортировку по умолчанию
@@ -420,51 +351,21 @@
 <dd>
 <div class="block">Конструктор с параметрами</div>
 </dd>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#logger">logger</a></span> - Static variable in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/util/UtilFunctions.html#longOrNull-java.lang.String-">longOrNull(String)</a></span> - Static method in class common.util.<a href="common/util/UtilFunctions.html" title="class in common.util">UtilFunctions</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="common/commandline/LongStrings.html" title="enum in common.commandline"><span class="typeNameLink">LongStrings</span></a> - Enum in <a href="common/commandline/package-summary.html">common.commandline</a></dt>
 <dd>&nbsp;</dd>
 </dl>
-<a name="I:M">
-<!--   -->
-</a>
-<h2 class="title">M</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.ColorAdapter.html#marshal-common.data.Color-">marshal(Color)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.ColorAdapter.html" title="class in common.parser">Adapters.ColorAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.CoordinateYAdapter.html#marshal-java.lang.Float-">marshal(Float)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser">Adapters.CoordinateYAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.CountryAdapter.html#marshal-common.data.Country-">marshal(Country)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.CountryAdapter.html" title="class in common.parser">Adapters.CountryAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.HeightAdapter.html#marshal-java.lang.Integer-">marshal(Integer)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.HeightAdapter.html" title="class in common.parser">Adapters.HeightAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.LocalDateAdapter.html#marshal-java.time.LocalDate-">marshal(LocalDate)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser">Adapters.LocalDateAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.NameAdapter.html#marshal-java.lang.String-">marshal(String)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.NameAdapter.html" title="class in common.parser">Adapters.NameAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.PassportAdapter.html#marshal-java.lang.String-">marshal(String)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.PassportAdapter.html" title="class in common.parser">Adapters.PassportAdapter</a></dt>
-<dd>&nbsp;</dd>
-</dl>
-<a name="I:N">
-<!--   -->
-</a>
-<h2 class="title">N</h2>
-<dl>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.NameAdapter.html#NameAdapter--">NameAdapter()</a></span> - Constructor for class common.parser.<a href="common/parser/Adapters.NameAdapter.html" title="class in common.parser">Adapters.NameAdapter</a></dt>
-<dd>&nbsp;</dd>
-</dl>
 <a name="I:P">
 <!--   -->
 </a>
 <h2 class="title">P</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.PassportAdapter.html#PassportAdapter--">PassportAdapter()</a></span> - Constructor for class common.parser.<a href="common/parser/Adapters.PassportAdapter.html" title="class in common.parser">Adapters.PassportAdapter</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="common/collection/PeopleDatabase.html" title="class in common.collection"><span class="typeNameLink">PeopleDatabase</span></a> - Class in <a href="common/collection/package-summary.html">common.collection</a></dt>
-<dd>
-<div class="block">Класс базы данных людей, реализующий интерфейс Database</div>
-</dd>
-<dt><span class="memberNameLink"><a href="common/collection/PeopleDatabase.html#PeopleDatabase-java.util.logging.Logger-">PeopleDatabase(Logger)</a></span> - Constructor for class common.collection.<a href="common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="common/collection/PeopleDatabase.html#PeopleDatabase--">PeopleDatabase()</a></span> - Constructor for class common.collection.<a href="common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/pdcommands/PeopleDatabaseCommands.html#peopleDatabase">peopleDatabase</a></span> - Static variable in class common.commandline.pdcommands.<a href="common/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in common.commandline.pdcommands">PeopleDatabaseCommands</a></dt>
 <dd>&nbsp;</dd>
@@ -485,10 +386,14 @@
 <div class="block">Класс данных человека, реализует сортировку по умолчанию по имени, номеру паспорта,
  росту, национальности, местоположению и цвету глаз</div>
 </dd>
-<dt><span class="memberNameLink"><a href="common/data/Person.html#Person-java.lang.String-common.data.Coordinates-java.lang.Integer-java.lang.String-common.data.Color-common.data.Country-common.data.Location-">Person(String, Coordinates, Integer, String, Color, Country, Location)</a></span> - Constructor for class common.data.<a href="common/data/Person.html" title="class in common.data">Person</a></dt>
+<dt><span class="memberNameLink"><a href="common/data/Person.html#Person-long-java.lang.String-common.data.Coordinates-java.lang.Integer-java.lang.String-common.data.Color-common.data.Country-common.data.Location-">Person(long, String, Coordinates, Integer, String, Color, Country, Location)</a></span> - Constructor for class common.data.<a href="common/data/Person.html" title="class in common.data">Person</a></dt>
 <dd>
 <div class="block">Конструктор с параметрами</div>
 </dd>
+<dt><span class="memberNameLink"><a href="common/data/Person.html#Person-java.lang.String-common.data.Coordinates-java.lang.Integer-java.lang.String-common.data.Color-common.data.Country-common.data.Location-">Person(String, Coordinates, Integer, String, Color, Country, Location)</a></span> - Constructor for class common.data.<a href="common/data/Person.html" title="class in common.data">Person</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#properties">properties</a></span> - Static variable in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:R">
 <!--   -->
@@ -513,41 +418,10 @@
 </a>
 <h2 class="title">S</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="common/collection/Database.html#save--">save()</a></span> - Method in interface common.collection.<a href="common/collection/Database.html" title="interface in common.collection">Database</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#setHostname-java.lang.String-">setHostname(String)</a></span> - Static method in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/collection/PeopleDatabase.html#save--">save()</a></span> - Method in class common.collection.<a href="common/collection/PeopleDatabase.html" title="class in common.collection">PeopleDatabase</a></dt>
-<dd>
-<div class="block">Метод, сохраняющий базу данных в файл, находящемся по пути, указанном в
- переменной окружения <a href="common/collection/PeopleDatabase.html#ENV_VAR"><code>PeopleDatabase.ENV_VAR</code></a></div>
-</dd>
-<dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.html#save-common.collection.PeopleDatabase-">save(PeopleDatabase)</a></span> - Method in class common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dt>
+<dt><span class="memberNameLink"><a href="common/net/ConnectionProperties.html#setPort-int-">setPort(int)</a></span> - Static method in class common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net">ConnectionProperties</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.SaveCommand.html#SaveCommand--">SaveCommand()</a></span> - Constructor for class common.commandline.<a href="common/commandline/CommandLineHandler.SaveCommand.html" title="class in common.commandline">CommandLineHandler.SaveCommand</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/data/Person.html#setHeight-java.lang.Integer-">setHeight(Integer)</a></span> - Method in class common.data.<a href="common/data/Person.html" title="class in common.data">Person</a></dt>
-<dd>
-<div class="block">Сеттер для поля height</div>
-</dd>
-<dt><span class="memberNameLink"><a href="common/parser/ConnectionProperties.html#setHostname-java.lang.String-">setHostname(String)</a></span> - Static method in class common.parser.<a href="common/parser/ConnectionProperties.html" title="class in common.parser">ConnectionProperties</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/data/Location.html#setName-java.lang.String-">setName(String)</a></span> - Method in class common.data.<a href="common/data/Location.html" title="class in common.data">Location</a></dt>
-<dd>
-<div class="block">Сеттер для поля name</div>
-</dd>
-<dt><span class="memberNameLink"><a href="common/data/Person.html#setName-java.lang.String-">setName(String)</a></span> - Method in class common.data.<a href="common/data/Person.html" title="class in common.data">Person</a></dt>
-<dd>
-<div class="block">Сеттер для поля name</div>
-</dd>
-<dt><span class="memberNameLink"><a href="common/data/Person.html#setPassportID-java.lang.String-">setPassportID(String)</a></span> - Method in class common.data.<a href="common/data/Person.html" title="class in common.data">Person</a></dt>
-<dd>
-<div class="block">Сеттер для поля passportID</div>
-</dd>
-<dt><span class="memberNameLink"><a href="common/parser/ConnectionProperties.html#setPort-int-">setPort(int)</a></span> - Static method in class common.parser.<a href="common/parser/ConnectionProperties.html" title="class in common.parser">ConnectionProperties</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/data/Coordinates.html#setY-float-">setY(float)</a></span> - Method in class common.data.<a href="common/data/Coordinates.html" title="class in common.data">Coordinates</a></dt>
-<dd>
-<div class="block">Сеттер для поля y</div>
-</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.html#start--">start()</a></span> - Method in class common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline">CommandLineHandler</a></dt>
 <dd>
 <div class="block">Метод, запускающий обработчик командной строки, для остановки требуется ввести команду "exit"</div>
@@ -566,20 +440,6 @@
 </a>
 <h2 class="title">U</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.ColorAdapter.html#unmarshal-java.lang.String-">unmarshal(String)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.ColorAdapter.html" title="class in common.parser">Adapters.ColorAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.CoordinateYAdapter.html#unmarshal-java.lang.String-">unmarshal(String)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser">Adapters.CoordinateYAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.CountryAdapter.html#unmarshal-java.lang.String-">unmarshal(String)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.CountryAdapter.html" title="class in common.parser">Adapters.CountryAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.HeightAdapter.html#unmarshal-java.lang.String-">unmarshal(String)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.HeightAdapter.html" title="class in common.parser">Adapters.HeightAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.LocalDateAdapter.html#unmarshal-java.lang.String-">unmarshal(String)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser">Adapters.LocalDateAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.NameAdapter.html#unmarshal-java.lang.String-">unmarshal(String)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.NameAdapter.html" title="class in common.parser">Adapters.NameAdapter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/parser/Adapters.PassportAdapter.html#unmarshal-java.lang.String-">unmarshal(String)</a></span> - Method in class common.parser.<a href="common/parser/Adapters.PassportAdapter.html" title="class in common.parser">Adapters.PassportAdapter</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandRegistry.html#unregisterCommand-java.lang.String-">unregisterCommand(String)</a></span> - Static method in class common.commandline.<a href="common/commandline/CommandRegistry.html" title="class in common.commandline">CommandRegistry</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/data/Person.html#update-common.data.Person-">update(Person)</a></span> - Method in class common.data.<a href="common/data/Person.html" title="class in common.data">Person</a></dt>
@@ -607,8 +467,6 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.HistoryCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class common.commandline.<a href="common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline">CommandLineHandler.HistoryCommand</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="common/commandline/CommandLineHandler.SaveCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class common.commandline.<a href="common/commandline/CommandLineHandler.SaveCommand.html" title="class in common.commandline">CommandLineHandler.SaveCommand</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/CommandRegistry.HelpCommand.html#validate-java.lang.String:A-">validate(String[])</a></span> - Method in class common.commandline.<a href="common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline">CommandRegistry.HelpCommand</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="common/commandline/pdcommands/PeopleDatabaseCommand.html#validateIdCommand-java.lang.String:A-">validateIdCommand(String[])</a></span> - Static method in class common.commandline.pdcommands.<a href="common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands">PeopleDatabaseCommand</a></dt>
@@ -668,7 +526,7 @@ the order they are declared.</div>
 the order they are declared.</div>
 </dd>
 </dl>
-<a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;</div>
+<a href="#I:A">A</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/Lab5Core/build/docs/javadoc/index.html b/Lab5Core/build/docs/javadoc/index.html
index 930b08f..afcf3b2 100644
--- a/Lab5Core/build/docs/javadoc/index.html
+++ b/Lab5Core/build/docs/javadoc/index.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Core 2.2 API</title>
+<title>Lab5Core 3.0 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/Lab5Core/build/docs/javadoc/overview-frame.html b/Lab5Core/build/docs/javadoc/overview-frame.html
index fb4b415..8f783d1 100644
--- a/Lab5Core/build/docs/javadoc/overview-frame.html
+++ b/Lab5Core/build/docs/javadoc/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (Lab5Core 2.2 API)</title>
+<title>Overview List (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -17,7 +17,7 @@
 <li><a href="common/commandline/pdcommands/package-frame.html" target="packageFrame">common.commandline.pdcommands</a></li>
 <li><a href="common/commandline/response/package-frame.html" target="packageFrame">common.commandline.response</a></li>
 <li><a href="common/data/package-frame.html" target="packageFrame">common.data</a></li>
-<li><a href="common/parser/package-frame.html" target="packageFrame">common.parser</a></li>
+<li><a href="common/net/package-frame.html" target="packageFrame">common.net</a></li>
 <li><a href="common/util/package-frame.html" target="packageFrame">common.util</a></li>
 </ul>
 </div>
diff --git a/Lab5Core/build/docs/javadoc/overview-summary.html b/Lab5Core/build/docs/javadoc/overview-summary.html
index f069a34..63d43a1 100644
--- a/Lab5Core/build/docs/javadoc/overview-summary.html
+++ b/Lab5Core/build/docs/javadoc/overview-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview (Lab5Core 2.2 API)</title>
+<title>Overview (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (Lab5Core 2.2 API)";
+            parent.document.title="Overview (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Lab5Core 2.2 API</h1>
+<h1 class="title">Lab5Core 3.0 API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
@@ -99,7 +99,7 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="common/parser/package-summary.html">common.parser</a></td>
+<td class="colFirst"><a href="common/net/package-summary.html">common.net</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
diff --git a/Lab5Core/build/docs/javadoc/overview-tree.html b/Lab5Core/build/docs/javadoc/overview-tree.html
index 10c8479..2ef825b 100644
--- a/Lab5Core/build/docs/javadoc/overview-tree.html
+++ b/Lab5Core/build/docs/javadoc/overview-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Class Hierarchy (Lab5Core 2.2 API)</title>
+<title>Class Hierarchy (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (Lab5Core 2.2 API)";
+            parent.document.title="Class Hierarchy (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -76,7 +76,7 @@
 <li><a href="common/commandline/pdcommands/package-tree.html">common.commandline.pdcommands</a>, </li>
 <li><a href="common/commandline/response/package-tree.html">common.commandline.response</a>, </li>
 <li><a href="common/data/package-tree.html">common.data</a>, </li>
-<li><a href="common/parser/package-tree.html">common.parser</a>, </li>
+<li><a href="common/net/package-tree.html">common.net</a>, </li>
 <li><a href="common/util/package-tree.html">common.util</a></li>
 </ul>
 </div>
@@ -85,35 +85,28 @@
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">common.parser.<a href="common/parser/Adapters.html" title="class in common.parser"><span class="typeNameLink">Adapters</span></a></li>
 <li type="circle">common.commandline.<a href="common/commandline/Command.html" title="class in common.commandline"><span class="typeNameLink">Command</span></a> (implements java.io.Serializable)
 <ul>
 <li type="circle">common.commandline.<a href="common/commandline/CommandLineHandler.ExecuteScriptCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.ExecuteScriptCommand</span></a></li>
 <li type="circle">common.commandline.<a href="common/commandline/CommandLineHandler.ExitCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.ExitCommand</span></a></li>
 <li type="circle">common.commandline.<a href="common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.HistoryCommand</span></a></li>
 <li type="circle">common.commandline.<a href="common/commandline/CommandRegistry.HelpCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandRegistry.HelpCommand</span></a></li>
-<li type="circle">common.commandline.pdcommands.<a href="common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">PeopleDatabaseCommand</span></a>
-<ul>
-<li type="circle">common.commandline.<a href="common/commandline/CommandLineHandler.SaveCommand.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.SaveCommand</span></a></li>
-</ul>
-</li>
+<li type="circle">common.commandline.pdcommands.<a href="common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">PeopleDatabaseCommand</span></a></li>
 </ul>
 </li>
 <li type="circle">common.commandline.<a href="common/commandline/CommandLineHandler.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler</span></a></li>
 <li type="circle">common.commandline.<a href="common/commandline/CommandRegistry.html" title="class in common.commandline"><span class="typeNameLink">CommandRegistry</span></a></li>
 <li type="circle">common.commandline.response.<a href="common/commandline/response/CommandResult.html" title="class in common.commandline.response"><span class="typeNameLink">CommandResult</span></a> (implements java.io.Serializable)</li>
-<li type="circle">common.parser.<a href="common/parser/ConnectionProperties.html" title="class in common.parser"><span class="typeNameLink">ConnectionProperties</span></a></li>
+<li type="circle">common.net.<a href="common/net/ConnectionProperties.html" title="class in common.net"><span class="typeNameLink">ConnectionProperties</span></a></li>
 <li type="circle">common.data.<a href="common/data/Coordinates.html" title="class in common.data"><span class="typeNameLink">Coordinates</span></a> (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)</li>
 <li type="circle">common.data.<a href="common/data/Location.html" title="class in common.data"><span class="typeNameLink">Location</span></a> (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)</li>
-<li type="circle">common.collection.<a href="common/collection/PeopleDatabase.html" title="class in common.collection"><span class="typeNameLink">PeopleDatabase</span></a> (implements common.collection.<a href="common/collection/Database.html" title="interface in common.collection">Database</a>)</li>
+<li type="circle">common.collection.<a href="common/collection/PeopleDatabase.html" title="class in common.collection"><span class="typeNameLink">PeopleDatabase</span></a></li>
 <li type="circle">common.commandline.pdcommands.<a href="common/commandline/pdcommands/PeopleDatabaseCommands.html" title="class in common.commandline.pdcommands"><span class="typeNameLink">PeopleDatabaseCommands</span></a></li>
 <li type="circle">common.data.<a href="common/data/Person.html" title="class in common.data"><span class="typeNameLink">Person</span></a> (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)</li>
 <li type="circle">java.lang.Throwable (implements java.io.Serializable)
 <ul>
 <li type="circle">java.lang.Exception
 <ul>
-<li type="circle">common.collection.<a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection"><span class="typeNameLink">Database.DatabaseLoadFailedException</span></a></li>
-<li type="circle">common.collection.<a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection"><span class="typeNameLink">Database.DatabaseSaveFailedException</span></a></li>
 <li type="circle">java.lang.RuntimeException
 <ul>
 <li type="circle">common.commandline.<a href="common/commandline/CommandLineHandler.CommandLineNotInitialized.html" title="class in common.commandline"><span class="typeNameLink">CommandLineHandler.CommandLineNotInitialized</span></a></li>
@@ -126,23 +119,11 @@
 </ul>
 </li>
 <li type="circle">common.util.<a href="common/util/UtilFunctions.html" title="class in common.util"><span class="typeNameLink">UtilFunctions</span></a></li>
-<li type="circle">javax.xml.bind.annotation.adapters.XmlAdapter&lt;ValueType,BoundType&gt;
-<ul>
-<li type="circle">common.parser.<a href="common/parser/Adapters.ColorAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.ColorAdapter</span></a></li>
-<li type="circle">common.parser.<a href="common/parser/Adapters.CoordinateYAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.CoordinateYAdapter</span></a></li>
-<li type="circle">common.parser.<a href="common/parser/Adapters.CountryAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.CountryAdapter</span></a></li>
-<li type="circle">common.parser.<a href="common/parser/Adapters.HeightAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.HeightAdapter</span></a></li>
-<li type="circle">common.parser.<a href="common/parser/Adapters.LocalDateAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.LocalDateAdapter</span></a></li>
-<li type="circle">common.parser.<a href="common/parser/Adapters.NameAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.NameAdapter</span></a></li>
-<li type="circle">common.parser.<a href="common/parser/Adapters.PassportAdapter.html" title="class in common.parser"><span class="typeNameLink">Adapters.PassportAdapter</span></a></li>
-</ul>
-</li>
 </ul>
 </li>
 </ul>
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
-<li type="circle">common.collection.<a href="common/collection/Database.html" title="interface in common.collection"><span class="typeNameLink">Database</span></a></li>
 <li type="circle">java.io.Serializable
 <ul>
 <li type="circle">common.commandline.<a href="common/commandline/Executable.html" title="interface in common.commandline"><span class="typeNameLink">Executable</span></a></li>
diff --git a/Lab5Core/build/docs/javadoc/package-list b/Lab5Core/build/docs/javadoc/package-list
index 4343044..8022346 100644
--- a/Lab5Core/build/docs/javadoc/package-list
+++ b/Lab5Core/build/docs/javadoc/package-list
@@ -3,5 +3,5 @@ common.commandline
 common.commandline.pdcommands
 common.commandline.response
 common.data
-common.parser
+common.net
 common.util
diff --git a/Lab5Core/build/docs/javadoc/serialized-form.html b/Lab5Core/build/docs/javadoc/serialized-form.html
index 3c13e12..8399627 100644
--- a/Lab5Core/build/docs/javadoc/serialized-form.html
+++ b/Lab5Core/build/docs/javadoc/serialized-form.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Serialized Form (Lab5Core 2.2 API)</title>
+<title>Serialized Form (Lab5Core 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (Lab5Core 2.2 API)";
+            parent.document.title="Serialized Form (Lab5Core 3.0 API)";
         }
     }
     catch(err) {
@@ -73,21 +73,6 @@
 <div class="serializedFormContainer">
 <ul class="blockList">
 <li class="blockList">
-<h2 title="Package">Package&nbsp;common.collection</h2>
-<ul class="blockList">
-<li class="blockList"><a name="common.collection.Database.DatabaseLoadFailedException">
-<!--   -->
-</a>
-<h3>Class <a href="common/collection/Database.DatabaseLoadFailedException.html" title="class in common.collection">common.collection.Database.DatabaseLoadFailedException</a> extends java.lang.Exception implements Serializable</h3>
-</li>
-<li class="blockList"><a name="common.collection.Database.DatabaseSaveFailedException">
-<!--   -->
-</a>
-<h3>Class <a href="common/collection/Database.DatabaseSaveFailedException.html" title="class in common.collection">common.collection.Database.DatabaseSaveFailedException</a> extends java.lang.Exception implements Serializable</h3>
-</li>
-</ul>
-</li>
-<li class="blockList">
 <h2 title="Package">Package&nbsp;common.commandline</h2>
 <ul class="blockList">
 <li class="blockList"><a name="common.commandline.Command">
@@ -142,11 +127,6 @@
 </a>
 <h3>Class <a href="common/commandline/CommandLineHandler.HistoryCommand.html" title="class in common.commandline">common.commandline.CommandLineHandler.HistoryCommand</a> extends <a href="common/commandline/Command.html" title="class in common.commandline">Command</a> implements Serializable</h3>
 </li>
-<li class="blockList"><a name="common.commandline.CommandLineHandler.SaveCommand">
-<!--   -->
-</a>
-<h3>Class <a href="common/commandline/CommandLineHandler.SaveCommand.html" title="class in common.commandline">common.commandline.CommandLineHandler.SaveCommand</a> extends <a href="common/commandline/pdcommands/PeopleDatabaseCommand.html" title="class in common.commandline.pdcommands">PeopleDatabaseCommand</a> implements Serializable</h3>
-</li>
 <li class="blockList"><a name="common.commandline.CommandRegistry.CommandAlreadyExistsException">
 <!--   -->
 </a>
diff --git a/Lab5Core/build/libs/Lab5Core-2.1.jar b/Lab5Core/build/libs/Lab5Core-2.1.jar
new file mode 100644
index 0000000..cff4af1
Binary files /dev/null and b/Lab5Core/build/libs/Lab5Core-2.1.jar differ
diff --git a/Lab5Core/build/libs/Lab5Core-2.2.jar b/Lab5Core/build/libs/Lab5Core-2.2.jar
new file mode 100644
index 0000000..f221b06
Binary files /dev/null and b/Lab5Core/build/libs/Lab5Core-2.2.jar differ
diff --git a/Lab5Core/build/libs/Lab5Core-3.0.jar b/Lab5Core/build/libs/Lab5Core-3.0.jar
new file mode 100644
index 0000000..782c6e9
Binary files /dev/null and b/Lab5Core/build/libs/Lab5Core-3.0.jar differ
diff --git a/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin
index 0f9e056..d55c28a 100644
Binary files a/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Core/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/Lab5Core/build/tmp/javadoc/javadoc.options b/Lab5Core/build/tmp/javadoc/javadoc.options
index bea736f..6f34354 100644
--- a/Lab5Core/build/tmp/javadoc/javadoc.options
+++ b/Lab5Core/build/tmp/javadoc/javadoc.options
@@ -1,11 +1,10 @@
 -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 2.2 API'
+-doctitle 'Lab5Core 3.0 API'
 -encoding 'UTF-8'
 -notimestamp 
 -quiet 
--windowtitle 'Lab5Core 2.2 API'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\collection\\Database.java'
+-windowtitle 'Lab5Core 3.0 API'
 'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\collection\\PeopleDatabase.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'
@@ -24,6 +23,5 @@
 '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\\parser\\Adapters.java'
-'C:\\Users\\egor\\IdeaProjects\\Lab5\\Lab5Core\\src\\main\\java\\common\\parser\\ConnectionProperties.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/Database.java b/Lab5Core/src/main/java/common/collection/Database.java
deleted file mode 100644
index f7ab56b..0000000
--- a/Lab5Core/src/main/java/common/collection/Database.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package common.collection;
-
-/**
- * Интерфейс баз данных с методами {@link #load()} и {@link #save()}
- */
-public interface Database {
-
-    void load() throws DatabaseLoadFailedException;
-
-    void save() throws DatabaseSaveFailedException;
-
-    class DatabaseLoadFailedException extends Exception {
-
-        public DatabaseLoadFailedException(String message) {
-            super(message);
-        }
-
-        public DatabaseLoadFailedException(String message, String path) {
-            super(String.format(message, path));
-        }
-
-        public DatabaseLoadFailedException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public DatabaseLoadFailedException(String message, String path, Throwable cause) {
-            super(String.format(message, path), cause);
-        }
-
-        public DatabaseLoadFailedException(Throwable cause) {
-            super(cause);
-        }
-    }
-
-    class DatabaseSaveFailedException extends Exception {
-
-        public DatabaseSaveFailedException(String message) {
-            super(message);
-        }
-
-        public DatabaseSaveFailedException(String message, String path) {
-            super(String.format(message, path));
-        }
-
-        public DatabaseSaveFailedException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public DatabaseSaveFailedException(String message, String path, Throwable cause) {
-            super(String.format(message, path), cause);
-        }
-
-        public DatabaseSaveFailedException(Throwable cause) {
-            super(cause);
-        }
-    }
-}
diff --git a/Lab5Core/src/main/java/common/collection/PeopleCollection.java b/Lab5Core/src/main/java/common/collection/PeopleCollection.java
new file mode 100644
index 0000000..26dfcc2
--- /dev/null
+++ b/Lab5Core/src/main/java/common/collection/PeopleCollection.java
@@ -0,0 +1,39 @@
+package common.collection;
+
+import lombok.Getter;
+import common.data.Person;
+
+import java.time.LocalDate;
+import java.util.Collections;
+import java.util.NavigableSet;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
+public class PeopleCollection {
+
+    private final static String TYPE = "TreeSet";
+
+    @Getter
+    private NavigableSet<Person> collection = Collections.synchronizedNavigableSet(new TreeSet<>());
+    @Getter
+    private LocalDate initDate = LocalDate.now();
+
+    public String info() {
+        return String.format("Тип коллекции: %s \n" +
+                        "Дата инициализации: %s \n" +
+                        "Количество элементов: %d \n",
+                TYPE, this.initDate, this.collection.size());
+    }
+
+    public void initFromDatabase(String url, String login, String password) {
+
+    }
+
+    @Override
+    public String toString() {
+        String result = "PeopleDatabase(";
+        result += this.collection.stream().map(Person::toString).collect(Collectors.joining(", "));
+        result += ")";
+        return result;
+    }
+}
diff --git a/Lab5Core/src/main/java/common/collection/PeopleDatabase.java b/Lab5Core/src/main/java/common/collection/PeopleDatabase.java
deleted file mode 100644
index e31df18..0000000
--- a/Lab5Core/src/main/java/common/collection/PeopleDatabase.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package common.collection;
-
-import lombok.Getter;
-import common.data.Person;
-import common.parser.Adapters;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.io.File;
-import java.io.IOException;
-import java.time.LocalDate;
-import java.util.TreeSet;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-/**
- * Класс базы данных людей, реализующий интерфейс Database
- *
- * @see Database
- */
-@XmlRootElement
-public class PeopleDatabase implements Database {
-
-    private final static String
-            ENV_VAR = "LAB5_PATH",
-            DEFAULT_FILE_NAME = "lab5.xml",
-            TYPE = "TreeSet";
-
-    @XmlTransient
-    private Logger logger = Logger.getLogger("Lab5Client");
-    @XmlTransient
-    private JAXBContext context;
-    @XmlTransient
-    private File file;
-    @Getter
-    @XmlElement(name = "person")
-    private TreeSet<Person> collection = new TreeSet<>();
-    @Getter
-    @XmlJavaTypeAdapter(Adapters.LocalDateAdapter.class)
-    @XmlElement(name = "initDate")
-    private LocalDate initDate = LocalDate.now();
-
-    {
-        try {
-            this.context = JAXBContext.newInstance(PeopleDatabase.class);
-        } catch (JAXBException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private PeopleDatabase() {}
-
-    public PeopleDatabase(Logger logger) {
-        this.logger = logger;
-    }
-
-    public String info() {
-        return String.format("Тип коллекции: %s \n" +
-                        "Дата инициализации: %s \n" +
-                        "Количество элементов: %d \n",
-                TYPE, this.initDate, this.collection.size());
-    }
-
-    /**
-     * Метод, инициализирующий базу данных из файла, находящемся по пути, указанном в
-     * переменной окружения {@link #ENV_VAR}
-     *
-     * @throws Database.DatabaseLoadFailedException если переменная окружения {@link #ENV_VAR} не задана,
-     *                                              файла не существует, либо отсутствуют права на запись или чтение
-     */
-    @Override
-    public void load() throws Database.DatabaseLoadFailedException {
-        logger.info("Инициализация коллекции из файла...");
-
-        String path = System.getenv(ENV_VAR);
-        boolean envSet = true;
-        if (path == null) {
-            logger.warning("Не найдена переменная окружения LAB5_PATH, создание файла в директории jar файла");
-            path = ".";
-            envSet = false;
-        }
-        File file = new File(path);
-
-        if (!file.exists() && envSet) {
-            logger.warning("Файл " + file.getAbsolutePath() + " не был найден, создание файла в директории jar файла");
-            file = new File(".");
-        }
-        if (file.isDirectory())
-            file = createFile(file);
-        if (!file.canRead())
-            throw new DatabaseLoadFailedException("У вас нет прав на чтение файла %s", file.getAbsolutePath());
-        if (!file.canWrite())
-            throw new DatabaseLoadFailedException("У вас нет прав на запись в файл %s", file.getAbsolutePath());
-        this.file = file;
-
-        try {
-            Unmarshaller unmarshaller = context.createUnmarshaller();
-            PeopleDatabase pd = (PeopleDatabase) unmarshaller.unmarshal(file);
-            this.collection = pd.collection;
-            this.initDate = pd.initDate;
-            logger.info("Инициализация успешно выполнена");
-        } catch (JAXBException e) {
-            logger.severe("Не удалось загрузить коллекцию из файла " + file.getAbsolutePath() + ", он пуст, либо нарушена структура xml");
-        }
-    }
-
-    /**
-     * Метод, сохраняющий базу данных в файл, находящемся по пути, указанном в
-     * переменной окружения {@link #ENV_VAR}
-     *
-     * @throws Database.DatabaseSaveFailedException если переменная окружения {@link #ENV_VAR} не задана,
-     *                                              файла не существует, либо отсутствуют права на запись или чтение, или если структура xml файла
-     *                                              была каким-либо образом нарушена
-     */
-    @Override
-    public void save() throws Database.DatabaseSaveFailedException {
-        if (!file.exists()) {
-            logger.warning("Файла " + file.getAbsolutePath() + " не существует, возможно он был удален, пытаюсь воссоздать файл...");
-            try {
-                file.createNewFile();
-                logger.info("Файл был успешно создан");
-            } catch (IOException e) {
-                throw new DatabaseSaveFailedException("Не удается создать файл заново, пожалуйста, сделайте это вручную и попробуйте еще раз");
-            }
-        }
-        try {
-            Marshaller marshaller = context.createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
-            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-            marshaller.marshal(this, file);
-        } catch (JAXBException e) {
-            throw new DatabaseSaveFailedException("Не удалось сохранить коллекцию в файл %s, формат xml файла был нарушен", file.getPath(), e);
-        }
-    }
-
-    private File createFile(File file) {
-        logger.info("Директория успешно найдена");
-        file = new File(file.getAbsolutePath() + "/" + DEFAULT_FILE_NAME);
-        boolean exists;
-        try {
-            exists = file.createNewFile();
-        } catch (IOException e) {
-            e.printStackTrace();
-            logger.severe("Что-то пошло не так");
-            System.exit(-1);
-            return null;
-        }
-        logger.info(exists ? "Файл не найден, создание файла " + DEFAULT_FILE_NAME : "Файл успешно найден");
-        return file;
-    }
-
-    @Override
-    public String toString() {
-        String result = "PeopleDatabase(";
-        result += this.collection.stream().map(Person::toString).collect(Collectors.joining(", "));
-        result += ")";
-        return result;
-    }
-}
diff --git a/Lab5Core/src/main/java/common/commandline/CommandLineHandler.java b/Lab5Core/src/main/java/common/commandline/CommandLineHandler.java
index 489a25e..d2a33a9 100644
--- a/Lab5Core/src/main/java/common/commandline/CommandLineHandler.java
+++ b/Lab5Core/src/main/java/common/commandline/CommandLineHandler.java
@@ -1,11 +1,7 @@
 package common.commandline;
 
-import common.collection.Database;
-import common.collection.PeopleDatabase;
-import common.commandline.pdcommands.PeopleDatabaseCommand;
 import common.commandline.response.CommandResult;
 import common.commandline.response.DefaultResponse;
-import common.commandline.response.PeopleDatabaseResponse;
 import common.commandline.response.Response;
 import common.util.UtilFunctions;
 
@@ -36,7 +32,7 @@ public abstract class CommandLineHandler {
 
     protected CommandLineHandler() {
         clearScreen();
-        CommandRegistry.registerCommands(new ExitCommand(), new HistoryCommand(), new ExecuteScriptCommand(), new SaveCommand());
+        CommandRegistry.registerCommands(new ExitCommand(), new HistoryCommand(), new ExecuteScriptCommand());
     }
 
     public static CommandLineHandler getInstance() {
@@ -100,7 +96,7 @@ public abstract class CommandLineHandler {
      *
      * @return Строка из потока ввода
      */
-    protected String awaitInput(String msg, String err) {
+    public String awaitInput(String msg, String err) {
         return awaitInput(msg, err, input -> true);
     }
 
@@ -226,21 +222,6 @@ public abstract class CommandLineHandler {
         return new CommandResult("Выход из программы...", DefaultResponse.OK);
     }
 
-    public CommandResult save(PeopleDatabase peopleDatabase) {
-        return save(new Object[]{ peopleDatabase });
-    }
-
-    private CommandResult save(Object[] args) {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
-        try {
-            peopleDatabase.save();
-            Response response = DefaultResponse.OK;
-            return new CommandResult(response.getMsg(), response);
-        } catch (Database.DatabaseSaveFailedException e) {
-            return new CommandResult(e.getMessage(), PeopleDatabaseResponse.SAVE_FAILED);
-        }
-    }
-
     public class ExitCommand extends Command {
         public ExitCommand() {
             super("exit", true, "exit : завершить программу (без сохранения в файл)");
@@ -291,19 +272,6 @@ public abstract class CommandLineHandler {
         }
     }
 
-    public class SaveCommand extends PeopleDatabaseCommand {
-        public SaveCommand() {
-            super("save", true, "save : сохранить коллекцию в файл");
-            this.executable = CommandLineHandler.this::save;
-        }
-
-        @Override
-        public boolean validate(String[] args) {
-            this.args = new Object[]{ null };
-            return true;
-        }
-    }
-
     public static class CommandLineNotInitialized extends RuntimeException {
         public CommandLineNotInitialized() {
             super();
diff --git a/Lab5Core/src/main/java/common/commandline/Executables.java b/Lab5Core/src/main/java/common/commandline/Executables.java
index c36c8bd..07687ea 100644
--- a/Lab5Core/src/main/java/common/commandline/Executables.java
+++ b/Lab5Core/src/main/java/common/commandline/Executables.java
@@ -1,6 +1,6 @@
 package common.commandline;
 
-import common.collection.PeopleDatabase;
+import common.collection.PeopleCollection;
 import common.commandline.response.CommandResult;
 import common.commandline.response.DefaultResponse;
 import common.commandline.response.PeopleDatabaseResponse;
@@ -12,48 +12,44 @@ import java.util.Optional;
 
 public enum Executables {
     ADD(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
         Person person = (Person) args[1];
-        boolean success = peopleDatabase.getCollection().add(person);
+        boolean success = peopleCollection.getCollection().add(person);
         Response response = PeopleDatabaseResponse.FAILED_TO_ADD;
-        if (success) {
-            Person.incrementExistingPeople();
-            person.setId(Person.getExistingPeople());
-            response = DefaultResponse.OK;
-        }
+        if (success) response = DefaultResponse.OK;
         return new CommandResult(response.getMsg(), response);
     }),
 
     ADD_IF_MAX(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
         Person person = (Person) args[1];
-        Person last = peopleDatabase.getCollection().last();
+        Person last = peopleCollection.getCollection().last();
         if (person.compareTo(last) > 0) return ADD.executable.execute(args);
         Response response = PeopleDatabaseResponse.FAILED_TO_ADD;
         return new CommandResult(response.getMsg(), response);
     }),
 
     ADD_IF_MIN(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
         Person person = (Person) args[1];
-        Person first = peopleDatabase.getCollection().first();
+        Person first = peopleCollection.getCollection().first();
         if (person.compareTo(first) < 0) return ADD.executable.execute(args);
         Response response = PeopleDatabaseResponse.FAILED_TO_ADD;
         return new CommandResult(response.getMsg(), response);
     }),
 
     CLEAR(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
-        peopleDatabase.getCollection().clear();
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
+        peopleCollection.getCollection().clear();
         Response response = DefaultResponse.OK;
         return new CommandResult(response.getMsg(), response);
     }),
 
     FILTER_CONTAINS_NAME(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
         String name = (String) args[1];
         StringBuilder result = new StringBuilder("Список людей, в имени которых содержится " + name + ":\n");
-        peopleDatabase.getCollection()
+        peopleCollection.getCollection()
                 .stream()
                 .filter(p -> p.getName().contains(name))
                 .forEach(p -> result.append(p.formatted()).append("\n"));
@@ -61,14 +57,14 @@ public enum Executables {
     }),
 
     INFO(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
-        return new CommandResult(peopleDatabase.info(), DefaultResponse.OK);
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
+        return new CommandResult(peopleCollection.info(), DefaultResponse.OK);
     }),
 
     PRINT_FIELD_DESCENDING_LOCATION(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
         StringBuilder result = new StringBuilder("Список локаций в порядке убывания:\n");
-        peopleDatabase.getCollection()
+        peopleCollection.getCollection()
                 .stream()
                 .map(Person::getLocation)
                 .sorted(Collections.reverseOrder())
@@ -77,23 +73,23 @@ public enum Executables {
     }),
 
     REMOVE_BY_ID(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
         long id = (long) args[1];
-        boolean success = peopleDatabase.getCollection().removeIf(p -> p.getId().equals(id));
+        boolean success = peopleCollection.getCollection().removeIf(p -> p.getId().equals(id));
         Response response = success ? DefaultResponse.OK : PeopleDatabaseResponse.ELEMENT_NOT_FOUND;
         return new CommandResult(response.getMsg(), response);
     }),
 
     SHOW(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
         StringBuilder result = new StringBuilder("Элементы коллекции:\n");
-        peopleDatabase.getCollection().forEach(p -> result.append(p.formatted()));
+        peopleCollection.getCollection().forEach(p -> result.append(p.formatted()));
         return new CommandResult(result.toString(), DefaultResponse.OK);
     }),
 
     SUM_OF_HEIGHT(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
-        String sum = "Сумма ростов всех людей в коллекции - " + peopleDatabase.getCollection()
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
+        String sum = "Сумма ростов всех людей в коллекции - " + peopleCollection.getCollection()
                 .stream()
                 .mapToInt(p -> p.getHeight() == null ? 0 : p.getHeight())
                 .sum();
@@ -101,29 +97,25 @@ public enum Executables {
     }),
 
     UPDATE(args -> {
-        PeopleDatabase peopleDatabase = (PeopleDatabase) args[0];
+        PeopleCollection peopleCollection = (PeopleCollection) args[0];
         long id = (long) args[1];
         Person person = (Person) args[2];
-        Optional<Person> optionalPerson = peopleDatabase.getCollection()
+        Optional<Person> optionalPerson = peopleCollection.getCollection()
                 .stream()
                 .filter(p -> p.getId().equals(id))
                 .findFirst();
         Response response = PeopleDatabaseResponse.ELEMENT_NOT_FOUND;
         if (!optionalPerson.isPresent()) return new CommandResult(response.getMsg(), response);
         Person oldPerson = optionalPerson.get();
-        CommandResult result = REMOVE_BY_ID.executable.execute(new Object[]{ peopleDatabase, id });
+        CommandResult result = REMOVE_BY_ID.executable.execute(new Object[]{peopleCollection, id });
         if (result.getResponse() != DefaultResponse.OK) return result;
         oldPerson.update(person);
-        return ADD.executable.execute(new Object[]{ peopleDatabase, oldPerson });
+        return ADD.executable.execute(new Object[]{peopleCollection, oldPerson });
     });
 
-    private final Executable executable;
+    public final Executable executable;
 
     Executables(Executable executable) {
         this.executable = executable;
     }
-
-    public Executable getExecutable() {
-        return executable;
-    }
 }
diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommand.java b/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommand.java
index 19a11d7..dddcfe1 100644
--- a/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommand.java
+++ b/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommand.java
@@ -15,7 +15,7 @@ public abstract class PeopleDatabaseCommand extends Command {
     }
 
     public CommandResult executeOnClient() {
-        args[0] = PeopleDatabaseCommands.peopleDatabase;
+        args[0] = PeopleDatabaseCommands.peopleCollection;
         return super.executeOnClient();
     }
 
diff --git a/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommands.java b/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommands.java
index bcf6077..e519d88 100644
--- a/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommands.java
+++ b/Lab5Core/src/main/java/common/commandline/pdcommands/PeopleDatabaseCommands.java
@@ -1,7 +1,7 @@
 package common.commandline.pdcommands;
 
 import common.commandline.CommandLineHandler;
-import common.collection.PeopleDatabase;
+import common.collection.PeopleCollection;
 import common.data.*;
 import common.util.UtilFunctions;
 
@@ -11,11 +11,11 @@ import java.util.Locale;
 /**
  * Класс объявления всех команд, связанных с манипуляциями над объектом класса PeopleDatabase
  *
- * @see PeopleDatabase
+ * @see PeopleCollection
  */
 public final class PeopleDatabaseCommands {
 
-    public static PeopleDatabase peopleDatabase;
+    public static PeopleCollection peopleCollection;
     private static final String COLORS = Arrays.toString(Color.values()),
                                 COUNTRIES = Arrays.toString(Country.values());
     private static final CommandLineHandler CMD = CommandLineHandler.getInstance();
diff --git a/Lab5Core/src/main/java/common/data/Coordinates.java b/Lab5Core/src/main/java/common/data/Coordinates.java
index 96a7b1e..872b150 100644
--- a/Lab5Core/src/main/java/common/data/Coordinates.java
+++ b/Lab5Core/src/main/java/common/data/Coordinates.java
@@ -1,18 +1,13 @@
 package common.data;
 
 import lombok.*;
-import common.parser.Adapters;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 
 /**
  * Класс данных координат
  */
 @Data @EqualsAndHashCode @ToString
-@XmlAccessorType(XmlAccessType.FIELD)
 public class Coordinates implements Comparable<Coordinates>, Serializable {
 
     /**
@@ -22,14 +17,8 @@ public class Coordinates implements Comparable<Coordinates>, Serializable {
     /**
      * Координата Y типа float, значение должно быть больше -816
      */
-    @XmlJavaTypeAdapter(Adapters.CoordinateYAdapter.class)
     private Float y;
 
-    private Coordinates() {
-        this.x = Adapters.DEFAULT_COORDINATE;
-        this.y = (float) Adapters.DEFAULT_COORDINATE;
-    }
-
     /**
      * Конструктор с параметрами
      *
@@ -38,18 +27,7 @@ public class Coordinates implements Comparable<Coordinates>, Serializable {
      */
     public Coordinates(float x, float y) {
         this.x = x;
-        this.setY(y);
-    }
-
-    /**
-     * Сеттер для поля y
-     *
-     * @param y Координата Y
-     */
-    public void setY(float y) {
         this.y = y;
-        if (y <= -816)
-            this.y = (float) Adapters.DEFAULT_COORDINATE;
     }
 
     private double distance() {
diff --git a/Lab5Core/src/main/java/common/data/Location.java b/Lab5Core/src/main/java/common/data/Location.java
index 8fe4119..9a2f68d 100644
--- a/Lab5Core/src/main/java/common/data/Location.java
+++ b/Lab5Core/src/main/java/common/data/Location.java
@@ -1,11 +1,7 @@
 package common.data;
 
 import lombok.*;
-import common.parser.Adapters;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import java.io.Serializable;
 import java.util.Comparator;
 
@@ -14,7 +10,6 @@ import java.util.Comparator;
  * по имени и расстоянию до точки (0; 0; 0)
  */
 @Data @EqualsAndHashCode @ToString
-@XmlAccessorType(XmlAccessType.FIELD)
 public class Location implements Comparable<Location>, Serializable {
     /**
      * Координата X типа double
@@ -31,16 +26,8 @@ public class Location implements Comparable<Location>, Serializable {
     /**
      * Имя локации, может быть null
      */
-    @XmlElement(nillable = true)
     private String name;
 
-    private Location() {
-        this.x = Adapters.DEFAULT_COORDINATE;
-        this.y = Adapters.DEFAULT_COORDINATE;
-        this.z = Adapters.DEFAULT_COORDINATE;
-        this.name = Adapters.DEFAULT_NAME;
-    }
-
     /**
      * Конструктор с параметрами
      *
@@ -55,17 +42,7 @@ public class Location implements Comparable<Location>, Serializable {
         this.x = x;
         this.y = y;
         this.z = z;
-        this.setName(name);
-    }
-
-    /**
-     * Сеттер для поля name
-     * @param name Имя локации
-     */
-    public void setName(String name) {
         this.name = name;
-        if (name != null && name.isEmpty())
-            this.name = Adapters.DEFAULT_NAME;
     }
 
     /**
diff --git a/Lab5Core/src/main/java/common/data/Person.java b/Lab5Core/src/main/java/common/data/Person.java
index 280b3f6..c3ca981 100644
--- a/Lab5Core/src/main/java/common/data/Person.java
+++ b/Lab5Core/src/main/java/common/data/Person.java
@@ -1,10 +1,7 @@
 package common.data;
 
 import lombok.*;
-import common.parser.Adapters;
 
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.util.*;
@@ -14,25 +11,15 @@ import java.util.*;
  * росту, национальности, местоположению и цвету глаз
  */
 @Data @EqualsAndHashCode @ToString
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
 public class Person implements Comparable<Person>, Serializable {
-    /**
-     * Количество созданных людей, используется для задания
-     * уникального id для каждого объекта данного класса
-     */
-    @XmlTransient @Getter
-    private static long existingPeople = 0;
     /**
      * Id человека, не может быть null, значение поля должно быть больше 0,
      * значение этого поля должно быть уникальным, значение этого поля должно генерироваться автоматически
      */
-    @XmlTransient @Setter
     private Long id;
     /**
      * Имя человека, не может быть null, строка не может быть пустой
      */
-    @XmlJavaTypeAdapter(Adapters.NameAdapter.class)
     private String name;
     /**
      * Координаты человека, не может быть null
@@ -41,53 +28,32 @@ public class Person implements Comparable<Person>, Serializable {
     /**
      * Дата создания объекта, не может быть null, значение этого поля должно генерироваться автоматически
      */
-    @XmlJavaTypeAdapter(Adapters.LocalDateAdapter.class)
     private LocalDate creationDate;
     /**
      * Рост человека, может быть null, значение поля должно быть больше 0
      */
-    @XmlElement(nillable = true)
-    @XmlJavaTypeAdapter(Adapters.HeightAdapter.class)
     private Integer height;
     /**
      * Номер паспорта человека, длина строки должна быть не меньше 8, поле может быть null
      */
-    @XmlElement(nillable = true)
-    @XmlJavaTypeAdapter(Adapters.PassportAdapter.class)
     private String passportID;
     /**
      * Цвет глаз человека, не может быть null
      */
-    @XmlJavaTypeAdapter(Adapters.ColorAdapter.class)
     private Color eyeColor;
     /**
      * Национальность человека, не может быть null
      */
-    @XmlJavaTypeAdapter(Adapters.CountryAdapter.class)
     private Country nationality;
     /**
      * Местоположение человека, может быть null
      */
     private Location location;
 
-    /**
-     * Конструктор для корректного преобразования человека из xml в объект
-     */
-    private Person() {
-        this.id = ++existingPeople;
-        this.creationDate = Adapters.DEFAULT_DATE;
-        this.name = Adapters.DEFAULT_NAME;
-        this.coordinates = Adapters.DEFAULT_COORDINATES;
-        this.height = Adapters.DEFAULT_HEIGHT;
-        this.passportID = Adapters.DEFAULT_PASSPORT;
-        this.eyeColor = Adapters.DEFAULT_COLOR;
-        this.nationality = Adapters.DEFAULT_COUNTRY;
-        this.location = Adapters.DEFAULT_LOCATION;
-    }
-
     /**
      * Конструктор с параметрами
      *
+     * @param id Id человека
      * @param name Имя человека
      * @param coordinates Координаты человека
      * @param height Высота человека
@@ -98,17 +64,22 @@ public class Person implements Comparable<Person>, Serializable {
      *
      * @throws NullPointerException Если name, coordinates, eyeColor или nationality являются null
      */
-    public Person(@NonNull String name, @NonNull Coordinates coordinates, Integer height, String passportID,
+    public Person(long id, @NonNull String name, @NonNull Coordinates coordinates, Integer height, String passportID,
                   @NonNull Color eyeColor, @NonNull Country nationality, Location location) {
-        this.id = existingPeople;
+        this.id = id;
         this.creationDate = LocalDate.now();
         this.location = location;
         this.coordinates = coordinates;
         this.eyeColor = eyeColor;
         this.nationality = nationality;
-        this.setName(name);
-        this.setHeight(height);
-        this.setPassportID(passportID);
+        this.name = name;
+        this.height = height;
+        this.passportID = passportID;
+    }
+
+    public Person(@NonNull String name, @NonNull Coordinates coordinates, Integer height, String passportID,
+                  @NonNull Color eyeColor, @NonNull Country nationality, Location location) {
+        this(0, name, coordinates, height, passportID, eyeColor, nationality, location);
     }
 
     /**
@@ -127,44 +98,6 @@ public class Person implements Comparable<Person>, Serializable {
         this.setPassportID(newPerson.passportID);
     }
 
-    public static void incrementExistingPeople() {
-        existingPeople++;
-    }
-
-    /**
-     * Сеттер для поля name
-     *
-     * @param name
-     * Имя человека
-     */
-    public void setName(String name) {
-        this.name = name;
-        if (name.isEmpty())
-            this.name = Adapters.DEFAULT_NAME;
-    }
-
-    /**
-     * Сеттер для поля height
-     *
-     * @param height Рост человека
-     */
-    public void setHeight(Integer height) {
-        this.height = height;
-        if (height != null && height <= 0)
-            this.height = Adapters.DEFAULT_HEIGHT;
-    }
-
-    /**
-     * Сеттер для поля passportID
-     *
-     * @param passportID Номер паспорта человека
-     */
-    public void setPassportID(String passportID) {
-        this.passportID = passportID;
-        if (passportID != null && passportID.length() < 8)
-            this.passportID = Adapters.DEFAULT_PASSPORT;
-    }
-
     public String formatted() {
         return String.format("Человек %s:\n" +
                         "\tИмя: %s\n" +
diff --git a/Lab5Core/src/main/java/common/net/ConnectionProperties.java b/Lab5Core/src/main/java/common/net/ConnectionProperties.java
new file mode 100644
index 0000000..e8b9e56
--- /dev/null
+++ b/Lab5Core/src/main/java/common/net/ConnectionProperties.java
@@ -0,0 +1,111 @@
+package common.net;
+
+import common.util.UtilFunctions;
+
+import java.io.*;
+import java.net.URL;
+import java.util.Properties;
+import java.util.function.Function;
+import java.util.logging.Logger;
+import java.util.stream.Collectors;
+
+public final class ConnectionProperties {
+
+    public static final Properties properties = new Properties();
+    public static final Logger logger = UtilFunctions.getLogger(ConnectionProperties.class, "common");
+    public static final int     DEFAULT_PORT = 1234,
+                                DEFAULT_DB_PORT = 5432;
+    public static final String  DEFAULT_HOST = "localhost",
+                                DEFAULT_DB_HOST = "pg",
+                                DEFAULT_DB_NAME = "studs";
+    public static final String FILE_NAME = "connection.properties";
+
+    static {
+        File file = new File(FILE_NAME);
+        try {
+            if (file.exists()) {
+                logger.info("Файл найден, загружаем настройки подключения...");
+            } else {
+                logger.warning("Файл не найден, создание файла " + FILE_NAME);
+                URL url = ConnectionProperties.class.getClassLoader().getResource(FILE_NAME);
+                if (url == null) {
+                    logger.severe("Jar файл поврежден, переустановите программу");
+                    System.exit(-1);
+                }
+                BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
+                String content = reader.lines().collect(Collectors.joining("\n"));
+                boolean wasCreated = file.createNewFile();
+                if (!wasCreated) {
+                    logger.severe("Невозможно создать файл " + FILE_NAME + ", недостаточно прав");
+                }
+                BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+                writer.write(content);
+                writer.close();
+                reader.close();
+                logger.info("Файл создан, загружаем настройки подключения");
+            }
+            properties.load(new FileInputStream(file));
+            logger.info("Настройки подключения загружены из файла " + FILE_NAME);
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.exit(-1);
+        }
+    }
+
+    public static String getHostname() {
+        return getTransformedProperty("hostname", DEFAULT_HOST);
+    }
+
+    public static void setHostname(String hostname) {
+        setProperty("hostname", hostname);
+    }
+
+    public static int getPort() {
+        return getTransformedProperty("port", DEFAULT_PORT, s -> {
+            Integer result = UtilFunctions.intOrNull(s);
+            return result == null ? DEFAULT_PORT : result;
+        });
+    }
+
+    public static void setPort(int port) {
+        setProperty("port", String.valueOf(port));
+    }
+
+    public static String getDbURL() {
+        String  host = getTransformedProperty("db_host", DEFAULT_DB_HOST),
+                port = getTransformedProperty("db_port", DEFAULT_DB_PORT, s -> {
+                    Integer result = UtilFunctions.intOrNull(s);
+                    if (result == null) {
+                        logger.info("db_port должен быть целым числом, используем значение по умолчанию " + DEFAULT_DB_PORT);
+                        return DEFAULT_DB_PORT;
+                    }
+                    return result;
+                }).toString(),
+                name = getTransformedProperty("db_name", DEFAULT_DB_NAME);
+        return String.format("jdbc:postgresql://%s:%s/%s", host, port, name);
+    }
+
+    private static String getTransformedProperty(String key, String def) {
+        return getTransformedProperty(key, def, s -> s);
+    }
+
+    private static <T> T getTransformedProperty(String key, T def, Function<String, T> transform) {
+        String property = properties.getProperty(key);
+        if (property == null) {
+            logger.info(String.format("Свойство %s не найдено, используем значение по умолчанию %s", key, def));
+            return def;
+        }
+        return transform.apply(property);
+    }
+
+    private static void setProperty(String key, String value) {
+        properties.setProperty(key, value);
+        File file = new File(FILE_NAME);
+        try (FileWriter writer = new FileWriter(file)) {
+            properties.store(writer, "Changed by user");
+            logger.info(String.format("Свойство %s успешно изменено", key));
+        } catch (IOException e) {
+            logger.severe(String.format("Не удалось сохранить свойство %s", key));
+        }
+    }
+}
diff --git a/Lab5Core/src/main/java/common/parser/Adapters.java b/Lab5Core/src/main/java/common/parser/Adapters.java
deleted file mode 100644
index 4ab80e1..0000000
--- a/Lab5Core/src/main/java/common/parser/Adapters.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package common.parser;
-
-import common.data.Color;
-import common.data.Coordinates;
-import common.data.Country;
-import common.data.Location;
-import common.util.UtilFunctions;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
-import java.util.Arrays;
-import java.util.Locale;
-
-public final class Adapters {
-
-    public final static LocalDate DEFAULT_DATE = LocalDate.of(1970, 1, 1);
-    public final static int DEFAULT_HEIGHT = 150;
-    public final static Color DEFAULT_COLOR = Color.BLACK;
-    public final static Country DEFAULT_COUNTRY = Country.UNITED_KINGDOM;
-    public final static String DEFAULT_NAME = "name",
-                                DEFAULT_PASSPORT = "passport";
-    public final static int DEFAULT_COORDINATE = 0;
-    public final static Coordinates DEFAULT_COORDINATES = new Coordinates(DEFAULT_COORDINATE, DEFAULT_COORDINATE);
-    public final static Location DEFAULT_LOCATION = new Location(DEFAULT_COORDINATE, DEFAULT_COORDINATE, DEFAULT_COORDINATE, DEFAULT_NAME);
-
-    public static class LocalDateAdapter extends XmlAdapter<String, LocalDate> {
-        @Override
-        public LocalDate unmarshal(String v) throws Exception {
-            try {
-                return LocalDate.parse(v);
-            } catch (DateTimeParseException e) {
-                System.err.printf("Не удалось преобразовать %s в тип LocalDate, используем значение по умолчанию %s\n", v, DEFAULT_DATE);
-                return DEFAULT_DATE;
-            }
-        }
-
-        @Override
-        public String marshal(LocalDate v) throws Exception {
-            return v.format(DateTimeFormatter.ISO_LOCAL_DATE);
-        }
-    }
-
-    public static class CoordinateYAdapter extends XmlAdapter<String, Float> {
-        @Override
-        public Float unmarshal(String v) throws Exception {
-            float result;
-            try {
-                result  = Float.parseFloat(v);
-            } catch (NumberFormatException e) {
-                return (float) DEFAULT_COORDINATE;
-            }
-            if (result <= -816F) {
-                System.err.printf("Координата Y %s не может быть меньше или равна -816, используем значение по умолчанию %s\n", v, DEFAULT_COORDINATE);
-                return (float) DEFAULT_COORDINATE;
-            }
-            return result;
-        }
-
-        @Override
-        public String marshal(Float v) throws Exception {
-            return v.toString();
-        }
-    }
-
-    public static class HeightAdapter extends XmlAdapter<String, Integer> {
-        @Override
-        public Integer unmarshal(String v) throws Exception {
-            if (v == null)
-                return null;
-            int result;
-            try {
-                result = Integer.parseInt(v);
-            } catch (NumberFormatException e) {
-                return DEFAULT_HEIGHT;
-            }
-            if (result <= 0) {
-                System.err.printf("Рост %s не может быть меньше или равен 0, используем значение по умолчанию %s\n", v, DEFAULT_HEIGHT);
-                return DEFAULT_HEIGHT;
-            }
-            return result;
-        }
-
-        @Override
-        public String marshal(Integer v) throws Exception {
-            return v.toString();
-        }
-    }
-
-    public static class NameAdapter extends XmlAdapter<String, String> {
-        @Override
-        public String unmarshal(String v) throws Exception {
-            if (v.isEmpty()) {
-                System.err.printf("Имя не может быть пустым, используем значение по умолчанию %s\n", DEFAULT_NAME);
-                return DEFAULT_NAME;
-            }
-            return v;
-        }
-
-        @Override
-        public String marshal(String v) throws Exception {
-            return v;
-        }
-    }
-
-    public static class PassportAdapter extends XmlAdapter<String, String> {
-        @Override
-        public String unmarshal(String v) throws Exception {
-            if (v.length() < 8) {
-                System.err.printf("Номер паспорта %s должен быть как минимум 8 символов в длину, используем значение по умолчанию %s\n", v, DEFAULT_PASSPORT);
-                return DEFAULT_PASSPORT;
-            }
-            return v;
-        }
-
-        @Override
-        public String marshal(String v) throws Exception {
-            return v;
-        }
-    }
-
-    public static class ColorAdapter extends XmlAdapter<String, Color> {
-        @Override
-        public Color unmarshal(String v) throws Exception {
-            Color color = UtilFunctions.enumOrNull(v.toUpperCase(Locale.ROOT), Color.class);
-            if (color == null) {
-                System.err.printf("Цвет глаз %s не соответствует одному из этих вариантов - %s, используем значение по умолчанию %s\n", v, Arrays.toString(Color.values()), DEFAULT_COLOR);
-                return DEFAULT_COLOR;
-            }
-            return color;
-        }
-
-        @Override
-        public String marshal(Color v) throws Exception {
-            return v.toString();
-        }
-    }
-
-    public static class CountryAdapter extends XmlAdapter<String, Country> {
-        @Override
-        public Country unmarshal(String v) throws Exception {
-            Country country = UtilFunctions.enumOrNull(v.toUpperCase(Locale.ROOT), Country.class);
-            if (country == null) {
-                System.err.printf("Национальность %s не соответствует одному из этих вариантов - %s, используем значение по умолчанию %s\n", v, Arrays.toString(Country.values()), DEFAULT_COUNTRY);
-                return DEFAULT_COUNTRY;
-            }
-            return country;
-        }
-
-        @Override
-        public String marshal(Country v) throws Exception {
-            return v.toString();
-        }
-    }
-}
diff --git a/Lab5Core/src/main/java/common/parser/ConnectionProperties.java b/Lab5Core/src/main/java/common/parser/ConnectionProperties.java
deleted file mode 100644
index 90e4204..0000000
--- a/Lab5Core/src/main/java/common/parser/ConnectionProperties.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package common.parser;
-
-import common.util.UtilFunctions;
-
-import java.io.*;
-import java.net.URL;
-import java.util.Properties;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-public final class ConnectionProperties {
-
-    private static final Properties properties = new Properties();
-    private static final Logger logger = UtilFunctions.getLogger(ConnectionProperties.class, "common");
-    private static final int DEFAULT_PORT = 1234;
-    private static final String DEFAULT_HOST = "localhost";
-    private static final String FILE_NAME = "connection.properties";
-
-    static {
-        File file = new File(FILE_NAME);
-        try {
-            if (file.exists()) {
-                logger.info("Файл найден, загружаем настройки подключения...");
-            } else {
-                logger.warning("Файл не найден, создание файла " + FILE_NAME);
-                URL url = ConnectionProperties.class.getClassLoader().getResource(FILE_NAME);
-                if (url == null) {
-                    logger.severe("Jar файл поврежден, переустановите программу");
-                    System.exit(-1);
-                }
-                BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()));
-                String content = reader.lines().collect(Collectors.joining("\n"));
-                boolean wasCreated = file.createNewFile();
-                if (!wasCreated) {
-                    logger.severe("Невозможно создать файл " + FILE_NAME + ", недостаточно прав");
-                }
-                BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-                writer.write(content);
-                writer.close();
-                reader.close();
-                logger.info("Файл создан, загружаем настройки подключения");
-            }
-            properties.load(new FileInputStream(file));
-            logger.info("Настройки подключения загружены из файла " + FILE_NAME);
-        } catch (IOException e) {
-            e.printStackTrace();
-            System.exit(-1);
-        }
-    }
-
-    public static String getHostname() {
-        String result = properties.getProperty("hostname");
-        if (result == null) {
-            logger.severe("Свойство hostname не было найдено, используем значение по умолчанию localhost");
-            return DEFAULT_HOST;
-        } else return result;
-    }
-
-    public static void setHostname(String hostname) {
-        properties.setProperty("hostname", hostname);
-        File file = new File(FILE_NAME);
-        try (FileWriter writer = new FileWriter(file)) {
-            properties.store(writer, "Changed by user");
-            logger.info("Адрес успешно изменен");
-        } catch (IOException e) {
-            logger.severe("Не удалось сохранить измененные значения");
-        }
-    }
-
-    public static int getPort() {
-        String resultStr = properties.getProperty("port");
-        if (resultStr == null) {
-            logger.severe("Свойство port не было найден, используем значение по умолчанию 1234");
-            return DEFAULT_PORT;
-        }
-        Integer result = UtilFunctions.intOrNull(resultStr);
-        if (result == null) {
-            logger.severe("Порт должен быть целым числом, используем значение по умолчанию 1234");
-            return DEFAULT_PORT;
-        }
-        return result;
-    }
-
-    public static void setPort(int port) {
-        properties.setProperty("port", String.valueOf(port));
-        File file = new File(FILE_NAME);
-        try (FileWriter writer = new FileWriter(file)) {
-            properties.store(writer, "Changed by user");
-            logger.info("Порт успешно изменен");
-        } catch (IOException e) {
-            logger.severe("Не удалось сохранить измененные значения");
-        }
-    }
-}
diff --git a/Lab5Server/build.gradle.kts b/Lab5Server/build.gradle.kts
index 119a2dd..b4b7603 100644
--- a/Lab5Server/build.gradle.kts
+++ b/Lab5Server/build.gradle.kts
@@ -4,8 +4,9 @@ plugins {
 }
 
 group = "ru.erius.lab5"
-version = "2.2"
+version = "3.0"
 val mainClass = "server.Lab5Server"
+val psqlJar = "postgresql-42.4.0.jar"
 
 repositories {
     mavenCentral()
@@ -14,7 +15,9 @@ repositories {
 dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    compileOnly(files("$buildDir/libs/$psqlJar"))
     implementation(project(":Lab5Core"))
+
 }
 
 tasks.getByName<Test>("test") {
@@ -30,11 +33,13 @@ tasks.javadoc {
 }
 
 tasks.shadowJar {
+    exclude(psqlJar)
     archiveClassifier.set("")
     manifest {
         attributes(
             "Manifest-Version" to "1.0",
-            "Main-Class" to mainClass
+            "Main-Class" to mainClass,
+            "Class-Path" to psqlJar
         )
     }
 }
diff --git a/Lab5Server/build/classes/java/main/server/Lab5Server.class b/Lab5Server/build/classes/java/main/server/Lab5Server.class
index 88022c7..cd71454 100644
Binary files a/Lab5Server/build/classes/java/main/server/Lab5Server.class and b/Lab5Server/build/classes/java/main/server/Lab5Server.class differ
diff --git a/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class b/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class
new file mode 100644
index 0000000..1f545a5
Binary files /dev/null and b/Lab5Server/build/classes/java/main/server/commandline/CommandLineHandlerServer.class differ
diff --git a/Lab5Server/build/classes/java/main/server/net/UDPServer.class b/Lab5Server/build/classes/java/main/server/net/UDPServer.class
index 9f384d2..9b15d36 100644
Binary files a/Lab5Server/build/classes/java/main/server/net/UDPServer.class and b/Lab5Server/build/classes/java/main/server/net/UDPServer.class differ
diff --git a/Lab5Server/build/docs/javadoc/allclasses-frame.html b/Lab5Server/build/docs/javadoc/allclasses-frame.html
index e457b18..6ee3d18 100644
--- a/Lab5Server/build/docs/javadoc/allclasses-frame.html
+++ b/Lab5Server/build/docs/javadoc/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Server 2.2 API)</title>
+<title>All Classes (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/allclasses-noframe.html b/Lab5Server/build/docs/javadoc/allclasses-noframe.html
index 6c78457..c5e361a 100644
--- a/Lab5Server/build/docs/javadoc/allclasses-noframe.html
+++ b/Lab5Server/build/docs/javadoc/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Lab5Server 2.2 API)</title>
+<title>All Classes (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/constant-values.html b/Lab5Server/build/docs/javadoc/constant-values.html
index 7a308ab..fca7af3 100644
--- a/Lab5Server/build/docs/javadoc/constant-values.html
+++ b/Lab5Server/build/docs/javadoc/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (Lab5Server 2.2 API)</title>
+<title>Constant Field Values (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (Lab5Server 2.2 API)";
+            parent.document.title="Constant Field Values (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/deprecated-list.html b/Lab5Server/build/docs/javadoc/deprecated-list.html
index 16d8c55..25a9011 100644
--- a/Lab5Server/build/docs/javadoc/deprecated-list.html
+++ b/Lab5Server/build/docs/javadoc/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (Lab5Server 2.2 API)</title>
+<title>Deprecated List (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (Lab5Server 2.2 API)";
+            parent.document.title="Deprecated List (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/help-doc.html b/Lab5Server/build/docs/javadoc/help-doc.html
index 0ab2559..1214bf5 100644
--- a/Lab5Server/build/docs/javadoc/help-doc.html
+++ b/Lab5Server/build/docs/javadoc/help-doc.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (Lab5Server 2.2 API)</title>
+<title>API Help (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (Lab5Server 2.2 API)";
+            parent.document.title="API Help (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/index-all.html b/Lab5Server/build/docs/javadoc/index-all.html
index 7f50d65..b515cab 100644
--- a/Lab5Server/build/docs/javadoc/index-all.html
+++ b/Lab5Server/build/docs/javadoc/index-all.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (Lab5Server 2.2 API)</title>
+<title>Index (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (Lab5Server 2.2 API)";
+            parent.document.title="Index (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/index.html b/Lab5Server/build/docs/javadoc/index.html
index c09b19d..1e5af00 100644
--- a/Lab5Server/build/docs/javadoc/index.html
+++ b/Lab5Server/build/docs/javadoc/index.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Server 2.2 API</title>
+<title>Lab5Server 3.0 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/Lab5Server/build/docs/javadoc/overview-frame.html b/Lab5Server/build/docs/javadoc/overview-frame.html
index b093556..078110d 100644
--- a/Lab5Server/build/docs/javadoc/overview-frame.html
+++ b/Lab5Server/build/docs/javadoc/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (Lab5Server 2.2 API)</title>
+<title>Overview List (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/overview-summary.html b/Lab5Server/build/docs/javadoc/overview-summary.html
index ecb3779..9bb1a00 100644
--- a/Lab5Server/build/docs/javadoc/overview-summary.html
+++ b/Lab5Server/build/docs/javadoc/overview-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview (Lab5Server 2.2 API)</title>
+<title>Overview (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (Lab5Server 2.2 API)";
+            parent.document.title="Overview (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Lab5Server 2.2 API</h1>
+<h1 class="title">Lab5Server 3.0 API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
diff --git a/Lab5Server/build/docs/javadoc/overview-tree.html b/Lab5Server/build/docs/javadoc/overview-tree.html
index 6fe64aa..60cdc51 100644
--- a/Lab5Server/build/docs/javadoc/overview-tree.html
+++ b/Lab5Server/build/docs/javadoc/overview-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Class Hierarchy (Lab5Server 2.2 API)</title>
+<title>Class Hierarchy (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (Lab5Server 2.2 API)";
+            parent.document.title="Class Hierarchy (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/server/Lab5Server.html b/Lab5Server/build/docs/javadoc/server/Lab5Server.html
index ef0bc48..bfe38e4 100644
--- a/Lab5Server/build/docs/javadoc/server/Lab5Server.html
+++ b/Lab5Server/build/docs/javadoc/server/Lab5Server.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>Lab5Server (Lab5Server 2.2 API)</title>
+<title>Lab5Server (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Lab5Server (Lab5Server 2.2 API)";
+            parent.document.title="Lab5Server (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Core/build/docs/javadoc/common/parser/ConnectionProperties.html b/Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html
similarity index 57%
rename from Lab5Core/build/docs/javadoc/common/parser/ConnectionProperties.html
rename to Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html
index 4694bb0..342a641 100644
--- a/Lab5Core/build/docs/javadoc/common/parser/ConnectionProperties.html
+++ b/Lab5Server/build/docs/javadoc/server/commandline/CommandLineHandlerServer.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>ConnectionProperties (Lab5Core 2.2 API)</title>
+<title>CommandLineHandlerServer (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ConnectionProperties (Lab5Core 2.2 API)";
+            parent.document.title="CommandLineHandlerServer (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -47,12 +47,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.PassportAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/ConnectionProperties.html" target="_top">Frames</a></li>
-<li><a href="ConnectionProperties.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?server/commandline/CommandLineHandlerServer.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandlerServer.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -72,15 +72,15 @@ var activeTableTab = "activeTableTab";
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested.classes.inherited.from.class.common.commandline.CommandLineHandler">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.CommandLineHandler">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -90,15 +90,20 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">common.parser</div>
-<h2 title="Class ConnectionProperties" class="title">Class ConnectionProperties</h2>
+<div class="subTitle">server.commandline</div>
+<h2 title="Class CommandLineHandlerServer" class="title">Class CommandLineHandlerServer</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>common.parser.ConnectionProperties</li>
+<li>common.commandline.CommandLineHandler</li>
+<li>
+<ul class="inheritance">
+<li>server.commandline.CommandLineHandlerServer</li>
+</ul>
+</li>
 </ul>
 </li>
 </ul>
@@ -107,29 +112,42 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public final class <span class="typeNameLabel">ConnectionProperties</span>
-extends java.lang.Object</pre>
+<pre>public class <span class="typeNameLabel">CommandLineHandlerServer</span>
+extends common.commandline.CommandLineHandler</pre>
 </li>
 </ul>
 </div>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<!-- ======== NESTED CLASS SUMMARY ======== -->
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a name="nested.class.summary">
 <!--   -->
 </a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../common/parser/ConnectionProperties.html#ConnectionProperties--">ConnectionProperties</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
+<h3>Nested Class Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.common.commandline.CommandLineHandler">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;common.commandline.CommandLineHandler</h3>
+<code>common.commandline.CommandLineHandler.CommandLineNotInitialized, common.commandline.CommandLineHandler.ExecuteScriptCommand, common.commandline.CommandLineHandler.ExitCommand, common.commandline.CommandLineHandler.HistoryCommand</code></li>
+</ul>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.common.commandline.CommandLineHandler">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;common.commandline.CommandLineHandler</h3>
+<code>fileNames, history, inputs, instance, isActive, reader</code></li>
+</ul>
 </li>
 </ul>
 <!-- ========== METHOD SUMMARY =========== -->
@@ -139,29 +157,29 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/ConnectionProperties.html#getHostname--">getHostname</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../server/commandline/CommandLineHandlerServer.html#executeCommand-java.lang.String-java.lang.String:A-">executeCommand</a></span>(java.lang.String&nbsp;alias,
+              java.lang.String[]&nbsp;args)</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/ConnectionProperties.html#getPort--">getPort</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/ConnectionProperties.html#setHostname-java.lang.String-">setHostname</a></span>(java.lang.String&nbsp;hostname)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../common/parser/ConnectionProperties.html#setPort-int-">setPort</a></span>(int&nbsp;port)</code>&nbsp;</td>
+<td class="colFirst"><code>static common.commandline.CommandLineHandler</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../server/commandline/CommandLineHandlerServer.html#getServerCommandLine--">getServerCommandLine</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.common.commandline.CommandLineHandler">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;common.commandline.CommandLineHandler</h3>
+<code>addNewInput, awaitInput, awaitInput, awaitInput, clearScreen, executeScript, exit, getInstance, history, history, input, isActive, removeInput, start, updateHistory</code></li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -176,63 +194,33 @@ extends java.lang.Object</pre>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ConnectionProperties--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ConnectionProperties</h4>
-<pre>public&nbsp;ConnectionProperties()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
 <ul class="blockList">
 <li class="blockList"><a name="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getHostname--">
+<a name="getServerCommandLine--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getHostname</h4>
-<pre>public static&nbsp;java.lang.String&nbsp;getHostname()</pre>
+<h4>getServerCommandLine</h4>
+<pre>public static&nbsp;common.commandline.CommandLineHandler&nbsp;getServerCommandLine()</pre>
 </li>
 </ul>
-<a name="setHostname-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setHostname</h4>
-<pre>public static&nbsp;void&nbsp;setHostname(java.lang.String&nbsp;hostname)</pre>
-</li>
-</ul>
-<a name="getPort--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getPort</h4>
-<pre>public static&nbsp;int&nbsp;getPort()</pre>
-</li>
-</ul>
-<a name="setPort-int-">
+<a name="executeCommand-java.lang.String-java.lang.String:A-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>setPort</h4>
-<pre>public static&nbsp;void&nbsp;setPort(int&nbsp;port)</pre>
+<h4>executeCommand</h4>
+<pre>protected&nbsp;void&nbsp;executeCommand(java.lang.String&nbsp;alias,
+                              java.lang.String[]&nbsp;args)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>executeCommand</code>&nbsp;in class&nbsp;<code>common.commandline.CommandLineHandler</code></dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -262,12 +250,12 @@ extends java.lang.Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../common/parser/Adapters.PassportAdapter.html" title="class in common.parser"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
-<li><a href="../../index.html?common/parser/ConnectionProperties.html" target="_top">Frames</a></li>
-<li><a href="ConnectionProperties.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../index.html?server/commandline/CommandLineHandlerServer.html" target="_top">Frames</a></li>
+<li><a href="CommandLineHandlerServer.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -287,15 +275,15 @@ extends java.lang.Object</pre>
 <div>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#nested.classes.inherited.from.class.common.commandline.CommandLineHandler">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.common.commandline.CommandLineHandler">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/Lab5Server/build/docs/javadoc/server/commandline/package-frame.html b/Lab5Server/build/docs/javadoc/server/commandline/package-frame.html
new file mode 100644
index 0000000..8cadcf6
--- /dev/null
+++ b/Lab5Server/build/docs/javadoc/server/commandline/package-frame.html
@@ -0,0 +1,19 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>server.commandline (Lab5Server 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../server/commandline/package-summary.html" target="classFrame">server.commandline</a></h1>
+<div class="indexContainer">
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="CommandLineHandlerServer.html" title="class in server.commandline" target="classFrame">CommandLineHandlerServer</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/Lab5Server/build/docs/javadoc/server/commandline/package-summary.html b/Lab5Server/build/docs/javadoc/server/commandline/package-summary.html
new file mode 100644
index 0000000..2c7faa6
--- /dev/null
+++ b/Lab5Server/build/docs/javadoc/server/commandline/package-summary.html
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>server.commandline (Lab5Server 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="server.commandline (Lab5Server 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../server/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../server/net/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?server/commandline/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Package" class="title">Package&nbsp;server.commandline</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../server/commandline/CommandLineHandlerServer.html" title="class in server.commandline">CommandLineHandlerServer</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../server/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../server/net/package-summary.html">Next&nbsp;Package</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?server/commandline/package-summary.html" target="_top">Frames</a></li>
+<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Server/build/docs/javadoc/server/commandline/package-tree.html b/Lab5Server/build/docs/javadoc/server/commandline/package-tree.html
new file mode 100644
index 0000000..a1be6ab
--- /dev/null
+++ b/Lab5Server/build/docs/javadoc/server/commandline/package-tree.html
@@ -0,0 +1,138 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="ru">
+<head>
+<!-- Generated by javadoc -->
+<title>server.commandline Class Hierarchy (Lab5Server 3.0 API)</title>
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="server.commandline Class Hierarchy (Lab5Server 3.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../server/package-tree.html">Prev</a></li>
+<li><a href="../../server/net/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?server/commandline/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">Hierarchy For Package server.commandline</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">common.commandline.CommandLineHandler
+<ul>
+<li type="circle">server.commandline.<a href="../../server/commandline/CommandLineHandlerServer.html" title="class in server.commandline"><span class="typeNameLink">CommandLineHandlerServer</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-all.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../server/package-tree.html">Prev</a></li>
+<li><a href="../../server/net/package-tree.html">Next</a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../index.html?server/commandline/package-tree.html" target="_top">Frames</a></li>
+<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/Lab5Server/build/docs/javadoc/server/net/UDPServer.html b/Lab5Server/build/docs/javadoc/server/net/UDPServer.html
index a544047..63e8963 100644
--- a/Lab5Server/build/docs/javadoc/server/net/UDPServer.html
+++ b/Lab5Server/build/docs/javadoc/server/net/UDPServer.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>UDPServer (Lab5Server 2.2 API)</title>
+<title>UDPServer (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UDPServer (Lab5Server 2.2 API)";
+            parent.document.title="UDPServer (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
@@ -146,7 +146,7 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../server/net/UDPServer.html#connect--">connect</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
@@ -209,7 +209,7 @@ extends java.lang.Object</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>connect</h4>
-<pre>public&nbsp;boolean&nbsp;connect()</pre>
+<pre>public&nbsp;void&nbsp;connect()</pre>
 </li>
 </ul>
 <a name="disconnect--">
diff --git a/Lab5Server/build/docs/javadoc/server/net/package-frame.html b/Lab5Server/build/docs/javadoc/server/net/package-frame.html
index 7147ef0..5ca76ac 100644
--- a/Lab5Server/build/docs/javadoc/server/net/package-frame.html
+++ b/Lab5Server/build/docs/javadoc/server/net/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server.net (Lab5Server 2.2 API)</title>
+<title>server.net (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/server/net/package-summary.html b/Lab5Server/build/docs/javadoc/server/net/package-summary.html
index b6c6e7d..5724caf 100644
--- a/Lab5Server/build/docs/javadoc/server/net/package-summary.html
+++ b/Lab5Server/build/docs/javadoc/server/net/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server.net (Lab5Server 2.2 API)</title>
+<title>server.net (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="server.net (Lab5Server 2.2 API)";
+            parent.document.title="server.net (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/server/net/package-tree.html b/Lab5Server/build/docs/javadoc/server/net/package-tree.html
index 9e4535d..f39ae58 100644
--- a/Lab5Server/build/docs/javadoc/server/net/package-tree.html
+++ b/Lab5Server/build/docs/javadoc/server/net/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server.net Class Hierarchy (Lab5Server 2.2 API)</title>
+<title>server.net Class Hierarchy (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="server.net Class Hierarchy (Lab5Server 2.2 API)";
+            parent.document.title="server.net Class Hierarchy (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/server/package-frame.html b/Lab5Server/build/docs/javadoc/server/package-frame.html
index 5bd2830..280b213 100644
--- a/Lab5Server/build/docs/javadoc/server/package-frame.html
+++ b/Lab5Server/build/docs/javadoc/server/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server (Lab5Server 2.2 API)</title>
+<title>server (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/Lab5Server/build/docs/javadoc/server/package-summary.html b/Lab5Server/build/docs/javadoc/server/package-summary.html
index 322c7c6..66f9332 100644
--- a/Lab5Server/build/docs/javadoc/server/package-summary.html
+++ b/Lab5Server/build/docs/javadoc/server/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server (Lab5Server 2.2 API)</title>
+<title>server (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="server (Lab5Server 2.2 API)";
+            parent.document.title="server (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/docs/javadoc/server/package-tree.html b/Lab5Server/build/docs/javadoc/server/package-tree.html
index 22cbb50..dfc094c 100644
--- a/Lab5Server/build/docs/javadoc/server/package-tree.html
+++ b/Lab5Server/build/docs/javadoc/server/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="ru">
 <head>
 <!-- Generated by javadoc -->
-<title>server Class Hierarchy (Lab5Server 2.2 API)</title>
+<title>server Class Hierarchy (Lab5Server 3.0 API)</title>
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="server Class Hierarchy (Lab5Server 2.2 API)";
+            parent.document.title="server Class Hierarchy (Lab5Server 3.0 API)";
         }
     }
     catch(err) {
diff --git a/Lab5Server/build/libs/Lab5Server-2.2.jar b/Lab5Server/build/libs/Lab5Server-2.2.jar
new file mode 100644
index 0000000..cb68b09
Binary files /dev/null and b/Lab5Server/build/libs/Lab5Server-2.2.jar differ
diff --git a/Lab5Server/build/libs/Lab5Server-3.0.jar b/Lab5Server/build/libs/Lab5Server-3.0.jar
new file mode 100644
index 0000000..c8bfc90
Binary files /dev/null and b/Lab5Server/build/libs/Lab5Server-3.0.jar differ
diff --git a/Lab5Server/build/libs/connection.properties b/Lab5Server/build/libs/connection.properties
index 749203d..81783a6 100644
--- a/Lab5Server/build/libs/connection.properties
+++ b/Lab5Server/build/libs/connection.properties
@@ -1,2 +1,5 @@
 hostname=localhost
-port=3232
\ No newline at end of file
+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
new file mode 100644
index 0000000..f5630d4
--- /dev/null
+++ b/Lab5Server/build/libs/connection.properties.bak
@@ -0,0 +1,2 @@
+hostname=localhost
+port=1234
\ No newline at end of file
diff --git a/Lab5Server/build/libs/postgresql-42.4.0.jar b/Lab5Server/build/libs/postgresql-42.4.0.jar
new file mode 100644
index 0000000..dd6024d
Binary files /dev/null and b/Lab5Server/build/libs/postgresql-42.4.0.jar differ
diff --git a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin b/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin
index 6567e59..2e9aabd 100644
Binary files a/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin and b/Lab5Server/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/Lab5Server/build/tmp/javadoc/javadoc.options b/Lab5Server/build/tmp/javadoc/javadoc.options
index c56d8bd..e619fdf 100644
--- a/Lab5Server/build/tmp/javadoc/javadoc.options
+++ b/Lab5Server/build/tmp/javadoc/javadoc.options
@@ -1,10 +1,10 @@
--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\\Lab5Core\\build\\libs\\Lab5Core-2.2.jar'
+-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 2.2 API'
+-doctitle 'Lab5Server 3.0 API'
 -encoding 'UTF-8'
 -notimestamp 
 -quiet 
--windowtitle 'Lab5Server 2.2 API'
+-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
index 6f371b5..ab5df96 100644
--- a/Lab5Server/build/tmp/shadowJar/MANIFEST.MF
+++ b/Lab5Server/build/tmp/shadowJar/MANIFEST.MF
@@ -1,3 +1,4 @@
 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 49b21e5..838d023 100644
--- a/Lab5Server/src/main/java/server/Lab5Server.java
+++ b/Lab5Server/src/main/java/server/Lab5Server.java
@@ -1,10 +1,9 @@
 package server;
 
-import common.collection.Database;
-import common.collection.PeopleDatabase;
+import common.collection.PeopleCollection;
 import common.commandline.CommandLineHandler;
 import common.commandline.pdcommands.PeopleDatabaseCommands;
-import common.parser.ConnectionProperties;
+import common.net.ConnectionProperties;
 import common.util.UtilFunctions;
 import server.commandline.CommandLineHandlerServer;
 import server.net.UDPServer;
@@ -16,27 +15,20 @@ public class Lab5Server {
     public final static Logger LOGGER = UtilFunctions.getLogger(Lab5Server.class, "server");
 
     public static void main(String[] args) {
-        PeopleDatabase peopleDatabase = new PeopleDatabase(LOGGER);
-        try {
-            peopleDatabase.load();
-        } catch (Database.DatabaseLoadFailedException e) {
-            System.out.println(e.getMessage());
-            System.exit(-1);
-        }
+        PeopleCollection peopleCollection = new PeopleCollection();
         CommandLineHandler cmd = CommandLineHandlerServer.getServerCommandLine();
-        PeopleDatabaseCommands.peopleDatabase = peopleDatabase;
+        PeopleDatabaseCommands.peopleCollection = peopleCollection;
         UDPServer udp = new UDPServer(ConnectionProperties.getPort(), LOGGER);
-        if (!udp.connect()) System.exit(-1);
+        udp.connect();
 
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> cmd.save(peopleDatabase)));
-
-        Thread thread = new Thread(() -> {
-            while (true)
-                udp.receive(peopleDatabase);
-        });
-        thread.setDaemon(true);
-        thread.start();
+        Runtime.getRuntime().addShutdownHook(new Thread());
 
         cmd.start();
+
+        Thread thread = new Thread(() -> {
+            while (cmd.isActive())
+                udp.receive(peopleCollection);
+        });
+        thread.start();
     }
 }
diff --git a/Lab5Server/src/main/java/server/net/UDPServer.java b/Lab5Server/src/main/java/server/net/UDPServer.java
index 283abf3..743abfd 100644
--- a/Lab5Server/src/main/java/server/net/UDPServer.java
+++ b/Lab5Server/src/main/java/server/net/UDPServer.java
@@ -1,13 +1,16 @@
 package server.net;
 
-import common.collection.PeopleDatabase;
+import common.collection.PeopleCollection;
 import common.commandline.Executable;
 import common.commandline.response.CommandResult;
 import common.commandline.response.DefaultResponse;
 import common.commandline.response.Response;
+import common.net.ConnectionProperties;
+import server.sql.SQLQueries;
 
 import java.io.*;
 import java.net.*;
+import java.sql.*;
 import java.util.logging.Logger;
 
 public class UDPServer {
@@ -16,21 +19,70 @@ public class UDPServer {
     private DatagramSocket socket;
     private final Logger logger;
     private final static int BUFFER_SIZE = 65_535;
+    private static Connection db_connection;
 
     public UDPServer(int port, Logger logger) {
         this.port = port;
         this.logger = logger;
     }
 
-    public boolean connect() {
+    public void connect() {
         logger.info("Подключаемся...");
+        do {
+            try {
+                socket = new DatagramSocket(port);
+                logger.info("Подключение установлено");
+            } catch (SocketException e) {
+                logger.severe("Не удалось установить соединение, порт занят");
+            }
+        } while (socket == null);
+        logger.info("Подключаемся к базе данных...");
         try {
-            socket = new DatagramSocket(port);
-            logger.info("Подключение установлено");
-            return true;
-        } catch (SocketException e) {
-            logger.severe("Не удалось установить соединение, порт занят");
-            return false;
+            Class.forName("org.postgresql.Driver");
+        } catch (ClassNotFoundException e) {
+            logger.severe("Драйвер JDBC для базы данных PostgreSQL не найден");
+            System.exit(-1);
+        }
+        DriverManager.setLoginTimeout(5);
+        String url = ConnectionProperties.getDbURL();
+        do {
+            Console console = System.console();
+            if (console == null) {
+                logger.severe("Не удалось получить консоль");
+                System.exit(-1);
+            }
+            String user = console.readLine("Введите логин: ");
+            char[] passwordBuff = console.readPassword("Ввелите пароль: ");
+            String password = passwordBuff == null ? null : new String(passwordBuff);
+            try {
+                if (user == null || password == null) logger.severe("Логин или пароль неверны, повторите попытку");
+                else db_connection = DriverManager.getConnection(url, user, password);
+                db_connection.setAutoCommit(false);
+            } catch (SQLTimeoutException e) {
+                logger.severe("Не удалось установить соединение с базой данных, время ожидание превышено");
+                System.exit(-1);
+            } catch (SQLException e) {
+                handleSqlException(e);
+            }
+        } while (db_connection == null);
+    }
+
+    private void handleSqlException(SQLException e) {
+        Throwable cause = e.getCause();
+        if (cause instanceof UnknownHostException) {
+            logger.severe("Не удалось установить соединение с базой данных, хост бд не найден");
+            System.exit(-1);
+        } else if (cause instanceof ConnectException) {
+            logger.severe("Не удалось установить соединение с базой данных, хост бд или порт не корректны");
+            System.exit(-1);
+        } else {
+            String firstLine = e.getMessage().split("\n")[0];
+            if (firstLine.contains("database")) {
+                logger.severe("Не удалось установить соединение с базой данных, бд с заданным именем не найдена");
+                System.exit(-1);
+            } else {
+                logger.severe("Логин или пароль неверны, повторите попытку");
+            }
         }
     }
 
@@ -58,7 +110,7 @@ public class UDPServer {
         logger.info("Результат отправлен клиенту");
     }
 
-    public void receive(PeopleDatabase peopleDatabase) {
+    public void receive(PeopleCollection peopleCollection) {
         logger.info("Ожидаем отправки данных от клиента...");
         byte[] buffer = new byte[BUFFER_SIZE];
         DatagramPacket request = new DatagramPacket(buffer, buffer.length);
@@ -70,7 +122,9 @@ public class UDPServer {
             Executable command = (Executable) objectInputStream.readObject();
             Object[] args = (Object[]) objectInputStream.readObject();
             objectInputStream.close();
-            if (args[0] == null) args[0] = peopleDatabase;
+            String query = SQLQueries.getQueryByExecutable(command);
+            boolean dbUpdated = updateDatabase(query);
+            if (args[0] == null) args[0] = peopleCollection;
             result = command.execute(args);
         } catch (IOException e) {
             logger.severe("Не удалось преобразовать полученные данные, данные были повреждены во время передачи");
@@ -89,4 +143,10 @@ public class UDPServer {
         logger.info("Команда выполнена, сохраняем и отправляем результат клиенту...");
         send(result, request.getAddress(), request.getPort());
     }
+
+    public static boolean updateDatabase(String query) {
+        PreparedStatement statement = db_connection.prepareStatement(query);
+        statement.setQueryTimeout(5);
+
+    }
 }
diff --git a/Lab5Server/src/main/java/server/sql/QuerySetup.java b/Lab5Server/src/main/java/server/sql/QuerySetup.java
new file mode 100644
index 0000000..ab2f4a9
--- /dev/null
+++ b/Lab5Server/src/main/java/server/sql/QuerySetup.java
@@ -0,0 +1,8 @@
+package server.sql;
+
+import java.sql.PreparedStatement;
+
+@FunctionalInterface
+public interface QuerySetup {
+    void setup(PreparedStatement statement, String[] data);
+}
diff --git a/Lab5Server/src/main/java/server/sql/SQLQueries.java b/Lab5Server/src/main/java/server/sql/SQLQueries.java
new file mode 100644
index 0000000..beb666c
--- /dev/null
+++ b/Lab5Server/src/main/java/server/sql/SQLQueries.java
@@ -0,0 +1,34 @@
+package server.sql;
+
+import common.commandline.Executable;
+import common.commandline.Executables;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum SQLQueries {
+    INSERT_PERSON("SELECT insert_person(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", (statement, data) -> {
+        statement.setString(1, data[1]);
+    }),
+    UPDATE_PERSON(""),
+    INSERT_USER("");
+
+    private static final Map<Executable, String> EXECUTABLE_SQL_QUERIES_MAP = new HashMap<>();
+
+    static {
+        EXECUTABLE_SQL_QUERIES_MAP.put(Executables.ADD.executable, INSERT_PERSON.query);
+        EXECUTABLE_SQL_QUERIES_MAP.put(Executables.UPDATE.executable, UPDATE_PERSON.query);
+    }
+
+    public final String query;
+    public final QuerySetup setup;
+
+    SQLQueries(String query, QuerySetup setup) {
+        this.query = query;
+        this.setup = setup;
+    }
+
+    public static String getQueryByExecutable(Executable executable) {
+        return EXECUTABLE_SQL_QUERIES_MAP.get(executable);
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index c96032f..78c63f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "ru.erius.lab5"
-version = "2.2"
+version = "3.0"
 
 repositories {
     mavenCentral()