diff --git a/ChatApp.iml b/ChatApp.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/ChatApp.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/HEAD b/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/config b/config new file mode 100644 index 0000000..ed10d06 --- /dev/null +++ b/config @@ -0,0 +1,14 @@ +[core] + repositoryformatversion = 0 + filemode = false + bare = false + logallrefupdates = true + symlinks = false + ignorecase = true + hideDotFiles = dotGitOnly +[remote "origin"] + url = http://github.com/KoshelKB21/ChatApp + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/description b/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/hooks/applypatch-msg.sample b/hooks/applypatch-msg.sample new file mode 100644 index 0000000..8b2a2fe --- /dev/null +++ b/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/hooks/commit-msg.sample b/hooks/commit-msg.sample new file mode 100644 index 0000000..b58d118 --- /dev/null +++ b/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/hooks/post-update.sample b/hooks/post-update.sample new file mode 100644 index 0000000..ec17ec1 --- /dev/null +++ b/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/hooks/pre-applypatch.sample b/hooks/pre-applypatch.sample new file mode 100644 index 0000000..b1f187c --- /dev/null +++ b/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/hooks/pre-commit.sample b/hooks/pre-commit.sample new file mode 100644 index 0000000..68d62d5 --- /dev/null +++ b/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/hooks/pre-push.sample b/hooks/pre-push.sample new file mode 100644 index 0000000..1f3bceb --- /dev/null +++ b/hooks/pre-push.sample @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/hooks/pre-rebase.sample b/hooks/pre-rebase.sample new file mode 100644 index 0000000..9773ed4 --- /dev/null +++ b/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +exit 0 + +################################################################ + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". diff --git a/hooks/prepare-commit-msg.sample b/hooks/prepare-commit-msg.sample new file mode 100644 index 0000000..f093a02 --- /dev/null +++ b/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/hooks/update.sample b/hooks/update.sample new file mode 100644 index 0000000..d847583 --- /dev/null +++ b/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/index b/index new file mode 100644 index 0000000..48a78da Binary files /dev/null and b/index differ diff --git a/info/exclude b/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/logs/HEAD b/logs/HEAD new file mode 100644 index 0000000..086fd81 --- /dev/null +++ b/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 9174500140abb5b2f28b7dfd07561b001ee21c1c hrust1kk 1446556672 +0200 clone: from http://github.com/KoshelKB21/ChatApp diff --git a/logs/refs/heads/master b/logs/refs/heads/master new file mode 100644 index 0000000..086fd81 --- /dev/null +++ b/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 9174500140abb5b2f28b7dfd07561b001ee21c1c hrust1kk 1446556672 +0200 clone: from http://github.com/KoshelKB21/ChatApp diff --git a/logs/refs/remotes/origin/HEAD b/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..086fd81 --- /dev/null +++ b/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 9174500140abb5b2f28b7dfd07561b001ee21c1c hrust1kk 1446556672 +0200 clone: from http://github.com/KoshelKB21/ChatApp diff --git a/objects/00/8ce8aedf051e8e66f249645c71ab647f8d4815 b/objects/00/8ce8aedf051e8e66f249645c71ab647f8d4815 new file mode 100644 index 0000000..945c4ec Binary files /dev/null and b/objects/00/8ce8aedf051e8e66f249645c71ab647f8d4815 differ diff --git a/objects/02/e7cafd3804bb4551def39480d08580057f106c b/objects/02/e7cafd3804bb4551def39480d08580057f106c new file mode 100644 index 0000000..ec678ec --- /dev/null +++ b/objects/02/e7cafd3804bb4551def39480d08580057f106c @@ -0,0 +1,4 @@ +xM +0@a9IjҤ cL') +%݉gp-az#m>&&Ȕ.GjirJ +J2"Wܐi/|q:O'|xX`戭EׯAi͜S0K)}'R'mLk\^ \ No newline at end of file diff --git a/objects/0a/01ea2fd1113a7a10e9ab6a287c23fc59935ba6 b/objects/0a/01ea2fd1113a7a10e9ab6a287c23fc59935ba6 new file mode 100644 index 0000000..0ecdb11 Binary files /dev/null and b/objects/0a/01ea2fd1113a7a10e9ab6a287c23fc59935ba6 differ diff --git a/objects/0a/eaa97fe05f89f7f1290a2d66d812f7f05bcf7e b/objects/0a/eaa97fe05f89f7f1290a2d66d812f7f05bcf7e new file mode 100644 index 0000000..6622466 Binary files /dev/null and b/objects/0a/eaa97fe05f89f7f1290a2d66d812f7f05bcf7e differ diff --git a/objects/0c/a7347372eb216c24eddb652fd4dc58c5885a4e b/objects/0c/a7347372eb216c24eddb652fd4dc58c5885a4e new file mode 100644 index 0000000..63a8454 Binary files /dev/null and b/objects/0c/a7347372eb216c24eddb652fd4dc58c5885a4e differ diff --git a/objects/10/cf05f4fb15b3673a671ea6b16e38d6a9b791f8 b/objects/10/cf05f4fb15b3673a671ea6b16e38d6a9b791f8 new file mode 100644 index 0000000..0a4c67a Binary files /dev/null and b/objects/10/cf05f4fb15b3673a671ea6b16e38d6a9b791f8 differ diff --git a/objects/12/a3451cef2e642c9fd9eab7b4b3ad4b17d7b2e7 b/objects/12/a3451cef2e642c9fd9eab7b4b3ad4b17d7b2e7 new file mode 100644 index 0000000..308992c Binary files /dev/null and b/objects/12/a3451cef2e642c9fd9eab7b4b3ad4b17d7b2e7 differ diff --git a/objects/17/443b3e16942feb776754978f8a8485ffbcaf84 b/objects/17/443b3e16942feb776754978f8a8485ffbcaf84 new file mode 100644 index 0000000..7faa5a0 Binary files /dev/null and b/objects/17/443b3e16942feb776754978f8a8485ffbcaf84 differ diff --git a/objects/18/b984a27ded49243f2bc5e2e8aff818e2b14ec0 b/objects/18/b984a27ded49243f2bc5e2e8aff818e2b14ec0 new file mode 100644 index 0000000..aac96c9 --- /dev/null +++ b/objects/18/b984a27ded49243f2bc5e2e8aff818e2b14ec0 @@ -0,0 +1,3 @@ +x-PMJPvS;ԕzkLIUZWHLB_M^ͤzL~GzT y.4G- +Myr! jBБ^!]dzc >^ +㣫$l5O5ʣ3ڃrT nf/fVs:Yn+g4cѕJȎ@mx7^$ݖpj UI{'d_Mq@(pnb7f`$4~j;=MBa׼hz%W< 8̔J/YVު%ٔdIDHE*rڕ;ׅ锁ƀwX3F# ,E0ZßtId 'KI4 5ܫ?.TAބZڸh6PΌ%ŕ`#E̲Қ3E!s;r`Ċw[K2&|G`rƘr@ST"c)el;G /󝁖=(ָ㌧N:m +OD$cci[קON>r,Ü*[N\T4Óy\?XlLBHḅwqy60s t$0Iu`%+2E4Z «_ Cpt}P59C0TJqt(fC/ + d2^>-AHcڗ|tz%j7¦b Ϥs훪nekw~SA[BR:~k|NoӾ7Dp ~utZd樨2l媌10]mezb+s+HyM0%FޖϘH]7+.K*B0eRʵ\0t:f5^ƖpރtxeƭWMcs빮_#`ύ P42S_2%&/;,$'{QP!p[psdݳ4)3 +k~VSLtNx|iONVdx NU!ѐ3B|i;`B2K I6r{th iFV`zA0i֭t!lO`kbNLՊdzq}ѰQD"GgqsQ\ջ[(GZB"O;P3 {O1ljT%SSi))䘍s'Gcp[{"ZW\xMU MʩB1g>Lե>쏱CEE||Zt+\0#;qQ109-[e+P(m@ܜ|Eu-eDJ=^p*S/Cș(=ڔz^-/X>ItAr?4<OP"T2ETΰ$j哹!-֢H6X>Ytc$٪Ed"3!OOvX 逦s 8A~!A( \N[ccyWx'mº<07/I˔"0>`B)\ Z/F3 .'G9KMR+ ڷOؙ7:A \ No newline at end of file diff --git a/objects/8b/137891791fe96927ad78e64b0aad7bded08bdc b/objects/8b/137891791fe96927ad78e64b0aad7bded08bdc new file mode 100644 index 0000000..9d8f605 Binary files /dev/null and b/objects/8b/137891791fe96927ad78e64b0aad7bded08bdc differ diff --git a/objects/8c/d8d58841728376773cc0d45f3258325ceedf8b b/objects/8c/d8d58841728376773cc0d45f3258325ceedf8b new file mode 100644 index 0000000..6ddfcdd Binary files /dev/null and b/objects/8c/d8d58841728376773cc0d45f3258325ceedf8b differ diff --git a/objects/8d/9c02ea6fb05f1cb9f792dece58b373fe9d9662 b/objects/8d/9c02ea6fb05f1cb9f792dece58b373fe9d9662 new file mode 100644 index 0000000..1afa32a Binary files /dev/null and b/objects/8d/9c02ea6fb05f1cb9f792dece58b373fe9d9662 differ diff --git a/objects/8d/c1618c7881e4eca8d293b0a34508f45542825f b/objects/8d/c1618c7881e4eca8d293b0a34508f45542825f new file mode 100644 index 0000000..14de9ac Binary files /dev/null and b/objects/8d/c1618c7881e4eca8d293b0a34508f45542825f differ diff --git a/objects/91/74500140abb5b2f28b7dfd07561b001ee21c1c b/objects/91/74500140abb5b2f28b7dfd07561b001ee21c1c new file mode 100644 index 0000000..8df575a Binary files /dev/null and b/objects/91/74500140abb5b2f28b7dfd07561b001ee21c1c differ diff --git a/objects/99/b9893c46ea56e957dc5d46f48ae61219dd701b b/objects/99/b9893c46ea56e957dc5d46f48ae61219dd701b new file mode 100644 index 0000000..2b63712 Binary files /dev/null and b/objects/99/b9893c46ea56e957dc5d46f48ae61219dd701b differ diff --git a/objects/9a/3547db180348562569b6b8ed7d497b82b5fd07 b/objects/9a/3547db180348562569b6b8ed7d497b82b5fd07 new file mode 100644 index 0000000..d1f9858 Binary files /dev/null and b/objects/9a/3547db180348562569b6b8ed7d497b82b5fd07 differ diff --git a/objects/9b/31df0bda7f10922a5b96250c3dde8df0dac70d b/objects/9b/31df0bda7f10922a5b96250c3dde8df0dac70d new file mode 100644 index 0000000..26d7eb2 Binary files /dev/null and b/objects/9b/31df0bda7f10922a5b96250c3dde8df0dac70d differ diff --git a/objects/a4/9bc19dd03a0f9bcc5f5a1e6b0ea09c416ad4f3 b/objects/a4/9bc19dd03a0f9bcc5f5a1e6b0ea09c416ad4f3 new file mode 100644 index 0000000..728b735 Binary files /dev/null and b/objects/a4/9bc19dd03a0f9bcc5f5a1e6b0ea09c416ad4f3 differ diff --git a/objects/a5/06dd3ea15388adad710025216712a57b2dc114 b/objects/a5/06dd3ea15388adad710025216712a57b2dc114 new file mode 100644 index 0000000..e8e3369 Binary files /dev/null and b/objects/a5/06dd3ea15388adad710025216712a57b2dc114 differ diff --git a/objects/a8/db3442c376415ddf591a108e7902f3206f7713 b/objects/a8/db3442c376415ddf591a108e7902f3206f7713 new file mode 100644 index 0000000..a11d6c6 Binary files /dev/null and b/objects/a8/db3442c376415ddf591a108e7902f3206f7713 differ diff --git a/objects/ac/a287e2931fbbe99f494685cbddf1042f807683 b/objects/ac/a287e2931fbbe99f494685cbddf1042f807683 new file mode 100644 index 0000000..303cb1e Binary files /dev/null and b/objects/ac/a287e2931fbbe99f494685cbddf1042f807683 differ diff --git a/objects/ad/e917b5eacabd770322b0c4db476f97ac0257d2 b/objects/ad/e917b5eacabd770322b0c4db476f97ac0257d2 new file mode 100644 index 0000000..dbd957b Binary files /dev/null and b/objects/ad/e917b5eacabd770322b0c4db476f97ac0257d2 differ diff --git a/objects/b1/498b4007b0e35a96598ccd23f1af2a94120a3e b/objects/b1/498b4007b0e35a96598ccd23f1af2a94120a3e new file mode 100644 index 0000000..960e542 Binary files /dev/null and b/objects/b1/498b4007b0e35a96598ccd23f1af2a94120a3e differ diff --git a/objects/b6/63b847be2524d8a3292eec29330e66b06f63bf b/objects/b6/63b847be2524d8a3292eec29330e66b06f63bf new file mode 100644 index 0000000..21aa1dc Binary files /dev/null and b/objects/b6/63b847be2524d8a3292eec29330e66b06f63bf differ diff --git a/objects/b6/9fa313d6b67464cee7db7dca9e6be19f72932b b/objects/b6/9fa313d6b67464cee7db7dca9e6be19f72932b new file mode 100644 index 0000000..a18879a Binary files /dev/null and b/objects/b6/9fa313d6b67464cee7db7dca9e6be19f72932b differ diff --git a/objects/b9/0e2b4ca5f5c5d33d26e2951fc04c69a1d2ed1a b/objects/b9/0e2b4ca5f5c5d33d26e2951fc04c69a1d2ed1a new file mode 100644 index 0000000..9e18fc9 Binary files /dev/null and b/objects/b9/0e2b4ca5f5c5d33d26e2951fc04c69a1d2ed1a differ diff --git a/objects/c6/f8a10b65aab0fa4c097e77cc98d1bee4764c44 b/objects/c6/f8a10b65aab0fa4c097e77cc98d1bee4764c44 new file mode 100644 index 0000000..e20b86d Binary files /dev/null and b/objects/c6/f8a10b65aab0fa4c097e77cc98d1bee4764c44 differ diff --git a/objects/c7/99f5703780f9370313ca50de1b506838968bd5 b/objects/c7/99f5703780f9370313ca50de1b506838968bd5 new file mode 100644 index 0000000..3de1990 Binary files /dev/null and b/objects/c7/99f5703780f9370313ca50de1b506838968bd5 differ diff --git a/objects/cc/64e410dc7ff16c9c401939d1ce75f5be4b0dcf b/objects/cc/64e410dc7ff16c9c401939d1ce75f5be4b0dcf new file mode 100644 index 0000000..aabc222 --- /dev/null +++ b/objects/cc/64e410dc7ff16c9c401939d1ce75f5be4b0dcf @@ -0,0 +1,2 @@ +xMN0@a9+!Hѣ㱈H8RC誕 +gpoD ,ӣ]~}kvv}# format : ChatApp 2015 user (busy) + public void sendNickHello(String ver, String nick){ + StringBuilder str = new StringBuilder(); + str.append(ver + " user " + nick + "\n"); + printer.print(str.toString()); + printer.flush(); + } + public void sendNickBusy(String ver, String nick){ + StringBuilder str = new StringBuilder(); + str.append(ver + " user " + nick + " busy" + "\n"); + printer.print(str.toString()); + printer.flush(); + } + public void send(String message){ + printer.print("Message"); + printer.flush(); + printer.print(message); + printer.flush(); + } +} diff --git a/src/Const.java b/src/Const.java new file mode 100644 index 0000000..a549ce9 --- /dev/null +++ b/src/Const.java @@ -0,0 +1,5 @@ + +public class Const { + public static final String VER = "ChatApp 2015"; + public static final String NICK = "unnamed"; +} diff --git a/src/MainForm.java b/src/MainForm.java new file mode 100644 index 0000000..b5f9cae --- /dev/null +++ b/src/MainForm.java @@ -0,0 +1,76 @@ +import java.awt.Color; +import java.awt.Font; + +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; + + +public class MainForm extends JFrame{ + + private JTextArea dialog = new JTextArea(); // dialogue history + private JTextField msg = new JTextField(); // new message + private JTextField locNick = new JTextField(); // local nick + private JTextField rmtAddr = new JTextField(); // remote address + private JTextField rmtNick = new JTextField();// remote nick + private JLabel localN = new JLabel("Local nick"); + private JLabel remoteAdr = new JLabel("Remote address"); + private JLabel remoteN = new JLabel("Remote nick"); + private JButton apply = new JButton("Apply"); + private JButton con = new JButton("Connect"); + private JButton discon = new JButton("Disconnect"); + + public MainForm(){ + setTitle("ChatApp 2015"); + setResizable(false); + setBounds(100, 100, 800,500); + setLayout(null); + + Font font = localN.getFont().deriveFont(15f); + + localN.setBounds(10, 20, 130, 20); + localN.setFont(font); + add(localN); + locNick.setBounds(135, 15, 150, 30); + add(locNick); + apply.setBounds(290, 15, 90, 30); + add(apply); + + remoteAdr.setBounds(10, 60, 130, 20); + remoteAdr.setFont(font); + add(remoteAdr); + rmtAddr.setBounds(135, 55, 150, 30); + add(rmtAddr); + con.setBounds(290, 55, 90, 30); + add(con); + + remoteN.setBounds(410, 20, 130, 20); + remoteN.setFont(font); + add(remoteN); + rmtNick.setBounds(520, 15, 150, 30); + add(rmtNick); + discon.setBounds(675, 15, 110, 30); + add(discon); + + dialog.setBounds(50, 100, 700, 250); + add(dialog); + + msg.setBounds(100, 380, 600, 60); + add(msg); + setVisible(true); + } + + public static void main(String[] args) { + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + MainForm form = new MainForm(); + } + }); + } + +} diff --git a/src/MessageCommand.java b/src/MessageCommand.java new file mode 100644 index 0000000..6d94880 --- /dev/null +++ b/src/MessageCommand.java @@ -0,0 +1,15 @@ +/** + * Created by user on 03.11.2015. + */ +public class MessageCommand extends Command { + private String message; + + public MessageCommand(String message) { + super(CommandType.MESSAGE); + this.message = message; + } + + public String toString(){ + return message; + } +} diff --git a/src/NickCommand.java b/src/NickCommand.java new file mode 100644 index 0000000..2209d0a --- /dev/null +++ b/src/NickCommand.java @@ -0,0 +1,22 @@ +/** + * Created by user on 03.11.2015. + */ +public class NickCommand extends Command { + private boolean busy; + private String nick; + private String version; + + public NickCommand(boolean busy, String nick, String version) { + super(CommandType.NICK); + this.busy = busy; + this.nick = nick; + this.version = version; + } + + public String toString(){ + if(busy) + return version + " nick " + nick + " busy"; + else + return version + " nick " + nick; + } +}