You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@mina.apache.org by Trustin Lee <tr...@gmail.com> on 2007/04/24 10:10:46 UTC
Re: svn commit: r531099 - in /mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client: ChatClientSupport.java SwingChatClient.java
Does this change affect the 1.0 branch either? Then we need to merge
this change there too.
Trustin
On 4/22/07, proyal@apache.org <pr...@apache.org> wrote:
> Author: proyal
> Date: Sat Apr 21 13:06:05 2007
> New Revision: 531099
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=531099
> Log:
> Fix example so it connects properly
>
> Modified:
> mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
> mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
>
> Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
> URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java?view=diff&rev=531099&r1=531098&r2=531099
> ==============================================================================
> --- mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java (original)
> +++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java Sat Apr 21 13:06:05 2007
> @@ -79,18 +79,14 @@
> return false;
> }
> session = future1.getSession();
> -
> + session.write( "LOGIN " + name );
> return true;
> }
> catch ( Exception e)
> {
> + e.printStackTrace();
> return false;
> }
> - }
> -
> - public void login()
> - {
> - session.write( "LOGIN " + name );
> }
>
> public void broadcast( String message )
>
> Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
> URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java?view=diff&rev=531099&r1=531098&r2=531099
> ==============================================================================
> --- mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java (original)
> +++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java Sat Apr 21 13:06:05 2007
> @@ -6,16 +6,16 @@
> * to you under the Apache License, Version 2.0 (the
> * "License"); you may not use this file except in compliance
> * with the License. You may obtain a copy of the License at
> - *
> + *
> * http://www.apache.org/licenses/LICENSE-2.0
> - *
> + *
> * Unless required by applicable law or agreed to in writing,
> * software distributed under the License is distributed on an
> * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> * KIND, either express or implied. See the License for the
> * specific language governing permissions and limitations
> - * under the License.
> - *
> + * under the License.
> + *
> */
> package org.apache.mina.example.chat.client;
>
> @@ -45,7 +45,7 @@
>
> /**
> * Simple chat client based on Swing & MINA that implements the chat protocol.
> - *
> + *
> * @author The Apache Directory Project (mina-dev@directory.apache.org)
> * @version $Rev$, $Date$
> */
> @@ -199,7 +199,7 @@
> private class BroadcastAction extends AbstractAction
> {
> /**
> - *
> + *
> */
> private static final long serialVersionUID = -6276019615521905411L;
>
> @@ -280,7 +280,6 @@
>
> public void connected()
> {
> - client.login();
> }
>
> public void disconnected()
>
>
>
--
what we call human nature is actually human habit
--
http://gleamynode.net/
--
PGP Key ID: 0x0255ECA6
Re: svn commit: r531099 - in
/mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client:
ChatClientSupport.java SwingChatClient.java
Posted by peter royal <pr...@apache.org>.
On Apr 30, 2007, at 11:12 AM, Trustin Lee wrote:
> I merged this change to branches/1.0.
thanks :) .. i hadn't quite made it to checking to see if the bug was
there too :)
-pete
>
> Trustin
>
> On 4/24/07, Trustin Lee <tr...@gmail.com> wrote:
>> Does this change affect the 1.0 branch either? Then we need to merge
>> this change there too.
--
proyal@apache.org - http://fotap.org/~osi
Re: svn commit: r531099 - in /mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client: ChatClientSupport.java SwingChatClient.java
Posted by Trustin Lee <tr...@gmail.com>.
I merged this change to branches/1.0.
Trustin
On 4/24/07, Trustin Lee <tr...@gmail.com> wrote:
> Does this change affect the 1.0 branch either? Then we need to merge
> this change there too.
>
> Trustin
>
> On 4/22/07, proyal@apache.org <pr...@apache.org> wrote:
> > Author: proyal
> > Date: Sat Apr 21 13:06:05 2007
> > New Revision: 531099
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=531099
> > Log:
> > Fix example so it connects properly
> >
> > Modified:
> > mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
> > mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
> >
> > Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
> > URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java?view=diff&rev=531099&r1=531098&r2=531099
> > ==============================================================================
> > --- mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java (original)
> > +++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java Sat Apr 21 13:06:05 2007
> > @@ -79,18 +79,14 @@
> > return false;
> > }
> > session = future1.getSession();
> > -
> > + session.write( "LOGIN " + name );
> > return true;
> > }
> > catch ( Exception e)
> > {
> > + e.printStackTrace();
> > return false;
> > }
> > - }
> > -
> > - public void login()
> > - {
> > - session.write( "LOGIN " + name );
> > }
> >
> > public void broadcast( String message )
> >
> > Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
> > URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java?view=diff&rev=531099&r1=531098&r2=531099
> > ==============================================================================
> > --- mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java (original)
> > +++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java Sat Apr 21 13:06:05 2007
> > @@ -6,16 +6,16 @@
> > * to you under the Apache License, Version 2.0 (the
> > * "License"); you may not use this file except in compliance
> > * with the License. You may obtain a copy of the License at
> > - *
> > + *
> > * http://www.apache.org/licenses/LICENSE-2.0
> > - *
> > + *
> > * Unless required by applicable law or agreed to in writing,
> > * software distributed under the License is distributed on an
> > * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > * KIND, either express or implied. See the License for the
> > * specific language governing permissions and limitations
> > - * under the License.
> > - *
> > + * under the License.
> > + *
> > */
> > package org.apache.mina.example.chat.client;
> >
> > @@ -45,7 +45,7 @@
> >
> > /**
> > * Simple chat client based on Swing & MINA that implements the chat protocol.
> > - *
> > + *
> > * @author The Apache Directory Project (mina-dev@directory.apache.org)
> > * @version $Rev$, $Date$
> > */
> > @@ -199,7 +199,7 @@
> > private class BroadcastAction extends AbstractAction
> > {
> > /**
> > - *
> > + *
> > */
> > private static final long serialVersionUID = -6276019615521905411L;
> >
> > @@ -280,7 +280,6 @@
> >
> > public void connected()
> > {
> > - client.login();
> > }
> >
> > public void disconnected()
> >
> >
> >
>
>
> --
> what we call human nature is actually human habit
> --
> http://gleamynode.net/
> --
> PGP Key ID: 0x0255ECA6
>
--
what we call human nature is actually human habit
--
http://gleamynode.net/
--
PGP Key ID: 0x0255ECA6