You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ed...@apache.org on 2008/07/24 01:40:39 UTC
svn commit: r679233 - in
/mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku:
Haiku.java HaikuValidationServer.java HaikuValidator.java
HaikuValidatorIoHandler.java InvalidHaikuException.java
PhraseUtilities.java ToHaikuIoFilter.java
Author: edeoliveira
Date: Wed Jul 23 16:40:38 2008
New Revision: 679233
URL: http://svn.apache.org/viewvc?rev=679233&view=rev
Log:
Fixed my unintentionnal commit
Modified:
mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/Haiku.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidationServer.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidator.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidatorIoHandler.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/InvalidHaikuException.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/PhraseUtilities.java
mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/ToHaikuIoFilter.java
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/Haiku.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/Haiku.java?rev=679233&r1=679232&r2=679233&view=diff
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/Haiku.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/Haiku.java Wed Jul 23 16:40:38 2008
@@ -22,12 +22,12 @@
/**
* @author Apache Mina Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: $, $Date: $
*/
public class Haiku {
private final String[] phrases;
- public Haiku(String[] lines) {
+ public Haiku(String... lines) {
this.phrases = lines;
if (null == lines || lines.length != 3) {
throw new IllegalArgumentException("Must pass in 3 phrases of text");
@@ -38,6 +38,7 @@
return phrases;
}
+ @Override
public boolean equals(Object o) {
if (this == o)
return true;
@@ -49,10 +50,12 @@
return Arrays.equals(phrases, haiku.phrases);
}
+ @Override
public int hashCode() {
return Arrays.hashCode(phrases);
}
+ @Override
public String toString() {
return Arrays.toString(phrases);
}
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidationServer.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidationServer.java?rev=679233&r1=679232&r2=679233&view=diff
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidationServer.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidationServer.java Wed Jul 23 16:40:38 2008
@@ -20,6 +20,8 @@
import java.net.InetSocketAddress;
import java.nio.charset.Charset;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
@@ -27,16 +29,13 @@
import org.apache.mina.transport.socket.nio.SocketAcceptor;
import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
-import edu.emory.mathcs.backport.java.util.concurrent.Executors;
-
/**
* @author Apache Mina Project (dev@mina.apache.org)
* @version $Rev: $, $Date: $
*/
public class HaikuValidationServer {
- public static void main(String[] args) throws Exception {
+ public static void main(String... args) throws Exception {
ExecutorService executor = Executors.newCachedThreadPool();
SocketAcceptor acceptor = new SocketAcceptor(Runtime.getRuntime()
.availableProcessors(), executor);
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidator.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidator.java?rev=679233&r1=679232&r2=679233&view=diff
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidator.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidator.java Wed Jul 23 16:40:38 2008
@@ -20,7 +20,7 @@
/**
* @author Apache Mina Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: $, $Date: $
*/
public class HaikuValidator {
private static final int[] SYLLABLE_COUNTS = { 5, 7, 5 };
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidatorIoHandler.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidatorIoHandler.java?rev=679233&r1=679232&r2=679233&view=diff
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidatorIoHandler.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/HaikuValidatorIoHandler.java Wed Jul 23 16:40:38 2008
@@ -23,13 +23,14 @@
/**
* @author Apache Mina Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: $, $Date: $
*/
public class HaikuValidatorIoHandler extends IoHandlerAdapter {
private final HaikuValidator validator = new HaikuValidator();
+ @Override
public void messageReceived(IoSession session, Object message)
throws Exception {
Haiku haiku = (Haiku) message;
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/InvalidHaikuException.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/InvalidHaikuException.java?rev=679233&r1=679232&r2=679233&view=diff
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/InvalidHaikuException.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/InvalidHaikuException.java Wed Jul 23 16:40:38 2008
@@ -20,7 +20,7 @@
/**
* @author Apache Mina Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: $, $Date: $
*/
public class InvalidHaikuException extends Exception {
private static final long serialVersionUID = 34877739006797894L;
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/PhraseUtilities.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/PhraseUtilities.java?rev=679233&r1=679232&r2=679233&view=diff
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/PhraseUtilities.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/PhraseUtilities.java Wed Jul 23 16:40:38 2008
@@ -8,9 +8,7 @@
static int countSyllablesInPhrase(String phrase) {
int syllables = 0;
- String[] words = phrase.split("[^\\w-]+");
- for (int i = 0, max = words.length; i < max; i++) {
- String word = words[i];
+ for (String word : phrase.split("[^\\w-]+")) {
if (word.length() > 0) {
syllables += countSyllablesInWord(word.toLowerCase());
}
Modified: mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/ToHaikuIoFilter.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/ToHaikuIoFilter.java?rev=679233&r1=679232&r2=679233&view=diff
==============================================================================
--- mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/ToHaikuIoFilter.java (original)
+++ mina/branches/1.1/example/src/main/java/org/apache/mina/example/haiku/ToHaikuIoFilter.java Wed Jul 23 16:40:38 2008
@@ -30,12 +30,14 @@
*/
public class ToHaikuIoFilter extends IoFilterAdapter {
+ @SuppressWarnings( { "unchecked" })
+ @Override
public void messageReceived(NextFilter nextFilter, IoSession session,
Object message) throws Exception {
- List phrases = (List) session.getAttribute("phrases");
+ List<String> phrases = (List<String>) session.getAttribute("phrases");
if (null == phrases) {
- phrases = new ArrayList();
+ phrases = new ArrayList<String>();
session.setAttribute("phrases", phrases);
}
@@ -44,8 +46,8 @@
if (phrases.size() == 3) {
session.removeAttribute("phrases");
- super.messageReceived(nextFilter, session, new Haiku(
- (String[]) phrases.toArray(new String[3])));
+ super.messageReceived(nextFilter, session, new Haiku(phrases
+ .toArray(new String[3])));
}
}
}