Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
0fbff29
Connection(not quite finished) and othet stuff(does not work)
Jojorr Nov 4, 2015
5731551
Rewrote Connection, should work properly now.
Jojorr Nov 4, 2015
043d748
Changed GUI, still should implement it in some way
Jojorr Nov 4, 2015
2f827fe
я ничего не сделал
Shazex Nov 5, 2015
dfb1046
если я правильно понял, то должно быть что-то типо такого...
Shazex Nov 5, 2015
cf4346c
если я правильно понял, то должно быть что-то типо такого...
Shazex Nov 5, 2015
a1e5aa4
Добавил static в поля
Shazex Nov 10, 2015
d2dda16
Добавил еще final, но завтра переделают кое что, это еще не окончател…
Shazex Nov 10, 2015
366729a
...
Shazex Nov 12, 2015
dd9fec9
GUI версия 1.1
Nov 12, 2015
f81a2d5
Еще одна формочка + мелкие исправления
Shazex Nov 12, 2015
9b68793
Wrote Caller, improved (IMO) connection
Jojorr Nov 14, 2015
ad2c1f1
GUI версия 1.2Added more layouts, scroll bar and set sizes
Nov 15, 2015
a66be33
GUI 1.2.2 исправлены ошибки
Nov 15, 2015
b6fed15
Wrote CallListener
Jojorr Nov 17, 2015
6ef3873
//чучуть потоков)
Shazex Nov 18, 2015
49394a7
переделан класс Command
Shazex Nov 18, 2015
dabb982
вот пустые формочки
Nov 18, 2015
71be400
Merge branch 'master' of https://github.com/Jojorr/ChatApp
Nov 18, 2015
934fd4d
Finished Recieve
Jojorr Nov 18, 2015
8fc7758
Merge branch 'master' of https://github.com/Jojorr/ChatApp
Jojorr Nov 18, 2015
f7b3ffa
вот [2]
Nov 18, 2015
7d56de2
Testing Connection (just in time)
Jojorr Nov 18, 2015
01507cb
мелкие поправки
Shazex Nov 18, 2015
ca52aaf
Merge remote-tracking branch 'origin/master'
Shazex Nov 18, 2015
76668d1
...
Nov 18, 2015
4777ac9
Some changes,don`t even remember what, too sleepy
Jojorr Nov 18, 2015
9645c2d
без комментариев
Shazex Nov 18, 2015
305cdfb
Merge remote-tracking branch 'origin/master'
Shazex Nov 18, 2015
b3f2713
без комментариев 2
Shazex Nov 19, 2015
515fd7f
Merge remote-tracking branch 'origin/master'
Jojorr Nov 19, 2015
dceb59a
Merge remote-tracking branch 'origin/master'
Jojorr Nov 19, 2015
96de34b
work
Jojorr Nov 19, 2015
463ad5b
Добавлены потоки
Shazex Nov 19, 2015
8e85046
fix threads
Shazex Nov 25, 2015
10a8265
Almost completed
Jojorr Nov 28, 2015
02be186
still broken, don`t know why
Jojorr Nov 29, 2015
9afb243
Add ServerConnection and small fixes
Shazex Dec 2, 2015
3502130
For Friends
Dec 2, 2015
be2d7cd
.
Dec 2, 2015
08cba74
.
Dec 2, 2015
1a21810
.
Dec 2, 2015
6060bca
Finally working chat, still should make output formatted properly
Jojorr Dec 6, 2015
0336d2c
Merge remote-tracking branch 'origin/master'
Jojorr Dec 6, 2015
0060250
added some methods
Jojorr Dec 6, 2015
2a40010
Fixed output
Jojorr Dec 6, 2015
54017d1
still fixing
Jojorr Dec 6, 2015
437783e
*
Shazex Dec 6, 2015
1fa62a6
/
Shazex Dec 6, 2015
22d50dc
ServerConnection
Shazex Dec 7, 2015
1300628
YEY, it works at last
Jojorr Dec 9, 2015
b09fb18
Broke git
Jojorr Dec 9, 2015
3e69fb0
Merge remote-tracking branch 'origin/master'
Jojorr Dec 9, 2015
773d108
small fixes
Shazex Dec 9, 2015
2a90b48
small fixes 2
Shazex Dec 9, 2015
06826ce
small fixes 3
Shazex Dec 9, 2015
f7ef372
editings
Dec 10, 2015
d368516
???
Shazex Dec 13, 2015
392e857
busy and disconnect
Shazex Dec 15, 2015
f19bca1
Tried to fix accept/reject
Jojorr Dec 16, 2015
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
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
20 changes: 20 additions & 0 deletions ChatApp.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/mysql-connector-java-5.1.38/mysql-connector-java-5.1.38/mysql-connector-java-5.1.38-bin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>
Binary file added ChatApp.txt
Binary file not shown.
3 changes: 3 additions & 0 deletions META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: ChatWindow

30 changes: 30 additions & 0 deletions src/BusyCommand.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

public class BusyCommand extends Command {
private String nick;

public BusyCommand(CommandTypes type, String nick) {
super(type);
this.nick = nick;
}

public String intoString() {
String s = "User " + this.nick +" is busy at that moment" + "\n";
return s;
}

public CommandTypes getType() {
return commandTypes;
}

public void setType(CommandTypes type) {
this.commandTypes = type;
}

public String getNick() {
return nick;
}

public void setNick(String nick) {
this.nick = nick;
}
}
29 changes: 29 additions & 0 deletions src/CallListener.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import java.io.*;
import java.net.*;

public class CallListener {
private Boolean isBusy;
private ServerSocket serverSocket;

public CallListener(){
setStatus(false);
}

public Connection getConnection() throws IOException{
if (StatusBusy()){
return null;
}else{
serverSocket = new ServerSocket(Protocol.PORT);
return new Connection(serverSocket.accept());
}
}


public Boolean StatusBusy(){
return isBusy;
}

public void setStatus(Boolean statusBusy){
this.isBusy = statusBusy;
}
}
72 changes: 72 additions & 0 deletions src/CallListenerThread.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import java.io.*;
import java.util.*;
import java.net.*;

public class CallListenerThread extends Observable implements Runnable {
private Socket socket;
private ServerSocket serverSocket;
private volatile boolean disconnected;
private Connection connection;
private boolean isBusy;
private CallListener callListener;

public CallListenerThread(){

}

public void start() {
this.disconnected = false;
Thread t = new Thread(this);
t.start();
}

public boolean isDisconnected() {
return disconnected;
}

public void stop() {
disconnected = true;
}

public Connection getConnection(){
if(socket!=null){
try {
return new Connection(socket);
} catch (IOException e) {
e.printStackTrace();
}
}
return null;
}

@Override
public void run(){
try {
serverSocket = new ServerSocket(Protocol.PORT);
while (true){
socket = serverSocket.accept();
//IncomingConnection incomingConnection = new IncomingConnection();
//if(Protocol.statusBusy == true){
connection = new Connection(socket);
if (connection.getSocket()!=null) {
CommandListenerThread clt = new CommandListenerThread(connection);
clt.addObserver(ChatWindow.observer);
clt.start();
connection.sendNickHello(Protocol.localNick);
}
//}
}
} catch (IOException e) {
e.printStackTrace();
}
}

public void setDisconnected(boolean b){
this.disconnected = b;
}

public void setBusy(Boolean isBusy){
this.isBusy = isBusy;
callListener.setStatus(isBusy);
}
}
19 changes: 19 additions & 0 deletions src/Caller.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import java.net.*;
import java.io.*;

public class Caller {
private Socket s;

public Caller() throws IOException{
s = new Socket(Protocol.IP,Protocol.PORT);
}

public Connection call() throws IOException {
try {
Class.forName("com.mysql.jdbc.Driver");
} catch (ClassNotFoundException e) {}
Connection c = new Connection(s);
c.sendNickHello(Protocol.localNick);
return c;
}
}
Loading