From 080fab859dfad4712a90511b4a9841df4b8549a4 Mon Sep 17 00:00:00 2001 From: Nikitot Date: Wed, 4 Feb 2015 21:16:35 +0300 Subject: [PATCH 1/5] fixed server name --- .idea/workspace.xml | 419 ++++-------------- out/production/clientDocks/ClientGUI$1.class | Bin 2336 -> 2327 bytes out/production/clientDocks/ClientGUI$10.class | Bin 1620 -> 1611 bytes out/production/clientDocks/ClientGUI$2.class | Bin 3693 -> 3684 bytes out/production/clientDocks/ClientGUI$8.class | Bin 1136 -> 1127 bytes out/production/clientDocks/ClientGUI$9.class | Bin 4249 -> 4240 bytes out/production/clientDocks/ClientGUI.class | Bin 8177 -> 8168 bytes ...Interface.class => ConnectInterface.class} | Bin 782 -> 776 bytes src/ClientGUI.java | 8 +- ...onInterface.java => ConnectInterface.java} | 2 +- 10 files changed, 97 insertions(+), 332 deletions(-) rename out/production/clientDocks/{ConnectionInterface.class => ConnectInterface.class} (77%) rename src/{ConnectionInterface.java => ConnectInterface.java} (96%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 799cd08..0c712dd 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -99,31 +99,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + + @@ -139,19 +118,17 @@ - + - - + + - - - - + + @@ -219,6 +196,7 @@ + @@ -272,7 +250,6 @@ - @@ -560,14 +537,15 @@ + - - + @@ -592,20 +570,20 @@ - + - + - - + + @@ -623,8 +601,8 @@ - + @@ -651,31 +629,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + + @@ -687,20 +644,52 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -710,29 +699,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + + @@ -749,12 +717,10 @@ - + - - - + @@ -767,29 +733,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + + @@ -806,12 +751,10 @@ - + - - - + @@ -824,29 +767,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + + @@ -858,12 +780,10 @@ - + - - - + @@ -876,39 +796,16 @@ - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - + @@ -921,39 +818,16 @@ - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - + @@ -966,29 +840,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + + @@ -997,29 +850,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1028,29 +860,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1059,29 +870,8 @@ - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1113,9 +903,7 @@ - - - + @@ -1125,52 +913,29 @@ - + - + - + - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/out/production/clientDocks/ClientGUI$1.class b/out/production/clientDocks/ClientGUI$1.class index 42f5abd5a024970a6d9ca5443f233cfc4b98d25b..08c6f8119efa62b0dcf6235971cfd57e32a040a0 100644 GIT binary patch delta 60 zcmZ1=G+k)IW=KF<=! F0sw#&6v6-i delta 68 zcmbO(v_NRWW*$)==ls09)Z~)P{Je>KbR?8De4KMKQ}asPLp`mL$~CQy6Lh diff --git a/out/production/clientDocks/ClientGUI$8.class b/out/production/clientDocks/ClientGUI$8.class index a24c3a71200f9abdf6d131faa2ea4b01a6cb1961..2d47c9418b02cf6cf2754368041152bec299f7f8 100644 GIT binary patch delta 59 zcmeys@tk9V52uiibADc4YI4cM2pv%c4Ik&6%+$OR_fSu3n8e08CQKXxP*t06Gfia# E0Bgk*(*OVf delta 68 zcmaFP@quH4509vibADc4YH~?te%{1T9SLO(ALpFR)Vvb+P)})B^V9> diff --git a/out/production/clientDocks/ClientGUI.class b/out/production/clientDocks/ClientGUI.class index 78c161affc16e9d1457d59827af1e0d34a779416..9986f332bf8a679a503295e2091198b1c817cc86 100644 GIT binary patch delta 340 zcmexp|H6L5eijZRb3FqfG@N{#rHGS5-z7h}ILOy?vOQ~~sep5SUS4W)iDzC(YEfEZ zawAphAdI zn=f!Ab50Hr65(iPwBlk|$=EU3P)MAui;J^e6ka3qqVSeeqLT`a!F=>o@ZW3YEfEZ zaw%Mi=DBZi?M?toRLAWIJLyFv?M<$wK%gX)i*yS zm4~s5(Ta;Mg|_B61V*1(&EIV9H8t>hA^OB##tc3m63rPDC?S%Spt!q z3zDpw%qy(L$?B7zo|(tNxOB3qu)N%IF2)s%H4x>&sX0JDr>5{Qt^z4v!MJ*Jt#At` zJIgl4PDyt5$sDrzVqi8Gken^a#k`GijwFaZe{!#^1LK^@=VY}wg&CJ^V_Yf8!!nss q&WLg4WD_|ZevpW+B;Rhv%t%%?7S_oh@kS diff --git a/out/production/clientDocks/ConnectionInterface.class b/out/production/clientDocks/ConnectInterface.class similarity index 77% rename from out/production/clientDocks/ConnectionInterface.class rename to out/production/clientDocks/ConnectInterface.class index 58f899909aa22ee016f633844fca8d6b99e4e033..1181f73d1ef39e5846e22d964aa5e33f8d0855ca 100644 GIT binary patch delta 45 vcmeBU>tNe(l~F;|IX^EiHMztyuOzi7EipM&FDtPuk&!_FD!%zQqc9@?ZC4Mc delta 51 ycmeBR>tow+l~GN?IX^EiHMt}+KhHC-B(*3lF*#K)E3qt*kwF+CwfQTfFe3onyb?J8 diff --git a/src/ClientGUI.java b/src/ClientGUI.java index 272ed47..97d6d48 100644 --- a/src/ClientGUI.java +++ b/src/ClientGUI.java @@ -40,11 +40,11 @@ public ClientGUI() throws RemoteException, NotBoundException, MalformedURLExcept newDocButton.setEnabled(false); newDocNameField.setEnabled(false); - String server = "10.10.1.3"; - final ConnectionInterface ci = (ConnectionInterface) Naming.lookup("//" + server + "/1527"); + String server = "127.0.0.1"; + final ConnectInterface ci = (ConnectInterface) Naming.lookup("//" + server + "/DocsRMI"); // InitialContext ic = new InitialContext(); -// final ConnectionInterface ci = (ConnectionInterface)ic.lookup("//10.10.1.3/nikitot"); +// final ConnectInterface ci = (ConnectInterface)ic.lookup("//10.10.1.3/nikitot"); loginOrCreateButton.addActionListener(new ActionListener() { @Override @@ -303,7 +303,7 @@ public void keyTyped(KeyEvent e) { }); } - private void updateDocsTable(ConnectionInterface ci) throws RemoteException { + private void updateDocsTable(ConnectInterface ci) throws RemoteException { Vector colsName = new Vector(); colsName.add("Name"); colsName.add("Author"); diff --git a/src/ConnectionInterface.java b/src/ConnectInterface.java similarity index 96% rename from src/ConnectionInterface.java rename to src/ConnectInterface.java index abf0408..30f3a27 100644 --- a/src/ConnectionInterface.java +++ b/src/ConnectInterface.java @@ -9,7 +9,7 @@ import java.rmi.RemoteException; import java.util.ArrayList; -public interface ConnectionInterface extends Remote { +public interface ConnectInterface extends Remote { // boolean createUser(String login, String password); // // boolean loginUser(String login, String password); From 4b30c6232396bf9b3b380a65afd61e77dc7280f2 Mon Sep 17 00:00:00 2001 From: Nikitot Date: Wed, 4 Feb 2015 21:22:55 +0300 Subject: [PATCH 2/5] gitignore xml --- .gitignore | 1 + .idea/workspace.xml | 27 ++++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6722cd9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0c712dd..34bf6c8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -99,9 +99,10 @@ - + + @@ -537,16 +538,16 @@ - + - - - + + @@ -570,7 +571,7 @@ - + @@ -632,6 +633,7 @@ + @@ -666,6 +668,7 @@ + @@ -700,6 +703,7 @@ + @@ -734,6 +738,7 @@ + @@ -768,6 +773,7 @@ + @@ -797,6 +803,7 @@ + @@ -819,6 +826,7 @@ + @@ -841,6 +849,7 @@ + @@ -851,6 +860,7 @@ + @@ -861,6 +871,7 @@ + @@ -871,6 +882,7 @@ + @@ -932,9 +944,10 @@ - + + From 24bd8c595add8b2c7727ea5151bcf1d3f9ebff35 Mon Sep 17 00:00:00 2001 From: Nikitot Date: Wed, 4 Feb 2015 21:30:56 +0300 Subject: [PATCH 3/5] stop tracking xml --- .idea/workspace.xml | 958 -------------------------------------------- 1 file changed, 958 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 34bf6c8..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,958 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - localhost - 5050 - - - - - - - - - - 1418723878521 - 1418723878521 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f4fc7b5fe8fa841fd49502b2bbbb062c543f2edb Mon Sep 17 00:00:00 2001 From: Nikitot Date: Thu, 5 Feb 2015 17:02:11 +0300 Subject: [PATCH 4/5] no message --- src/ClientGUI.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ClientGUI.java b/src/ClientGUI.java index 97d6d48..132f1d9 100644 --- a/src/ClientGUI.java +++ b/src/ClientGUI.java @@ -42,9 +42,9 @@ public ClientGUI() throws RemoteException, NotBoundException, MalformedURLExcept String server = "127.0.0.1"; final ConnectInterface ci = (ConnectInterface) Naming.lookup("//" + server + "/DocsRMI"); - -// InitialContext ic = new InitialContext(); -// final ConnectInterface ci = (ConnectInterface)ic.lookup("//10.10.1.3/nikitot"); +// modules/glassfish-naming +// InitialContext ic = new InitialContext(); +// final ConnectInterface ci = (ConnectInterface)ic.lookup("//10.10.1.3/nikitot"); loginOrCreateButton.addActionListener(new ActionListener() { @Override From 6872d4549a5ab0dd6dd02de4b9660afcc69f138c Mon Sep 17 00:00:00 2001 From: Nikitot Date: Thu, 12 Feb 2015 01:25:37 +0300 Subject: [PATCH 5/5] no message --- out/production/clientDocks/AddDocsTab.class | Bin 3460 -> 3460 bytes out/production/clientDocks/ClientGUI.class | Bin 8168 -> 8168 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/out/production/clientDocks/AddDocsTab.class b/out/production/clientDocks/AddDocsTab.class index acdf1d0b95b582342417fbe4a8d09e48e5bfc31e..f1536a4cf736668643bee0e2311c9b02fdc4dbfa 100644 GIT binary patch delta 187 zcmZpXZjs)g%Q`uLRg|NQL5qu_grR)0HmmgJRMrEGNxa3WC9Wx%C7F5YLHXr846{Hg zW-!cVWDr2eIOpe-=H~G*%!NqKV`LD@N-Rs%Pb@Fdch1i($j?j7D`96?z{tP_(v+8& zl#`mm!?1`!jf-L7=5}@u7EUJiZ44DUf{d#s-{20BW!lCtN0MbXLw%%xoPff1hNf){ YlO$PyqVpwLSSEY#?Jyn^Qr0JEJoIRF3v delta 188 zcmZpXZjs)g%R1SIRg$-iL5qu_grS^~L8v%&b1>^A#w4Mv#Ii*F#PSk-=ltA){Jhk> z5_X1Jj0{}GsU@y?iAg!BDLf2w7}U5JW;4uXWZ(q}r(~97=A{Sam-8^p2bnm7VF4q9 z07Aw&Kc_S|kB4CqSaNeay9Wy=d;a8JSqH{Blh4U&aSAgo+s3$3l80q7qnr`r%E=~jI{Y9J fT}i&(jG2+FY%HvkKgfwrZjno1T)FwF95W*Tsj4~R delta 199 zcmaE1|H6L5O(7F5#%@MeMh5QU)DqW}%#y^UoKzmhSqx!Zj8%-Y85wwh;%@oLrNt15 zxgd$|$-Kf^lbwWRHJ3s(2B+qvCYPk9@Gve1$uDDE!N|bslb@cM$HBM?#IM<0EBuR7 zjCmX5Oi3=5ZH#lk! fT}i&(jG2+FY%HvkKgfwrZjno1T(kM995W*T!%;c;