Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions OWNER.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Кудрявцев Дмитрий Вальтерович
12 changes: 4 additions & 8 deletions config.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<root>

<bean id="gearBean" class="arhangel.dim.container.beans.Gear">
<property name="count" val="6"/>
<bean id="port" class="arhangel.dim.container.beans.WebConnection">
<property name="port" val="9000"/>
</bean>

<bean id="engineBean" class="arhangel.dim.container.beans.Engine">
<property name="power" val="200"/>
<bean id="host" class="arhangel.dim.container.beans.WebConnection">
<property name="host" val="0"/>
</bean>

<bean id="carBean" class="arhangel.dim.container.beans.Car">
<property name="gear" ref="gearBean"/>
<property name="engine" ref="engineBean"/>
</bean>

</root>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<configuration>
<mainClass>arhangel.dim.lections.jdbc.JdbcExample</mainClass>
<mainClass>arhangel.dim.core.jdbc.DataBaseOrganizer</mainClass>
</configuration>
</plugin>
<plugin>
Expand Down
195 changes: 0 additions & 195 deletions src/main/java/arhangel/dim/client/Client.java

This file was deleted.

111 changes: 111 additions & 0 deletions src/main/java/arhangel/dim/client/ClientMain.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
package arhangel.dim.client;

import arhangel.dim.container.Container;
import arhangel.dim.container.beans.WebConnection;
import arhangel.dim.core.message.Message;

import java.io.BufferedReader;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.InputStreamReader;
import java.net.Socket;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;

public class ClientMain {

private Socket socket;

private DataInputStream in;
private DataOutputStream out;

/**
* Нить, отвечающая за получение сообщений от сервера
*/
private Thread listenThread;

/**
* Нить, отвечающая за отправку сообщений на сервер
*/
private Thread writeThread;

/**
* Очередь, для обмена сообщений для отправки между главной нитью и writeThread
*/
private BlockingQueue<Message> messagesToWrite;

/**
* Классы, отвечающие за работу нитей
*/
private MessageListener listener;
private MessageWriter writer;

public ClientMain() {
}

public void init() {
try {
Container container = new Container("C:\\Users\\Дмитрий\\Documents\\technotrack\\java\\messenger\\config.xml");
WebConnection portAndHost = (WebConnection)container.getByClass("arhangel.dim.container.beans.WebConnection");
int port = portAndHost.getPort();
String host = portAndHost.getHost();
socket = new Socket(host, port);
in = new DataInputStream(socket.getInputStream());
out = new DataOutputStream(socket.getOutputStream());
messagesToWrite = new ArrayBlockingQueue<>(10);
listener = new MessageListener(in);
writer = new MessageWriter(out, messagesToWrite);
listenThread = new Thread(listener);
writeThread = new Thread(writer);
listenThread.start();
writeThread.start();
} catch (Exception e) {
System.err.println("Client initialization: exception caught: " + e.toString());
}
}

public void handleUserCommands() throws Exception {
BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
String line;
while (true) {
line = reader.readLine();
Message writeMessage;
if (line.startsWith("/")) {
writeMessage = new Message();
writeMessage.setMessage(line);
messagesToWrite.put(writeMessage);
if (line.equals("/exit")) {
System.out.println("Closing..");
stopThreads();
break;
}
} else {
writeMessage = new Message();
writeMessage.setMessage(line);
messagesToWrite.put(writeMessage);
}
}
}

public void stopThreads() {
try {
listenThread.interrupt();
writeThread.interrupt();
// join
} catch (Exception e) {
System.err.println("Failed to stop threads " + e.toString());
} finally {
IoUtil.closeQuietly(socket);
}
}

public static void main(String[] args) {
ClientMain threadedClient = new ClientMain();
threadedClient.init();
try {
threadedClient.handleUserCommands();
} catch (Exception e) {
System.err.println("Client: exception caught: " + e.toString());
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package arhangel.dim.lections.socket;
package arhangel.dim.client;

import java.io.Closeable;

Expand Down
Loading