From 82b6e75b96c4cd3ae4b51039adcfd21bc83fa983 Mon Sep 17 00:00:00 2001
From: Trustin Lee <t@motd.kr>
Date: Mon, 16 Dec 2013 14:58:14 +0900
Subject: [PATCH] Rename flushAndWrite() to writeAndFlush()

- Related: #2066
---
 .../src/main/java/io/netty/channel/group/ChannelGroup.java  | 4 ++--
 .../java/io/netty/channel/group/DefaultChannelGroup.java    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/transport/src/main/java/io/netty/channel/group/ChannelGroup.java b/transport/src/main/java/io/netty/channel/group/ChannelGroup.java
index 88c7ab9c75..579e498fe8 100644
--- a/transport/src/main/java/io/netty/channel/group/ChannelGroup.java
+++ b/transport/src/main/java/io/netty/channel/group/ChannelGroup.java
@@ -154,13 +154,13 @@ public interface ChannelGroup extends Set<Channel>, Comparable<ChannelGroup> {
     /**
      * Shortcut for calling {@link #write(Object)} and {@link #flush()}.
      */
-    ChannelGroupFuture flushAndWrite(Object message);
+    ChannelGroupFuture writeAndFlush(Object message);
 
     /**
      * Shortcut for calling {@link #write(Object)} and {@link #flush()} and only act on
      * {@link Channel}s that match the {@link ChannelMatcher}.
      */
-    ChannelGroupFuture flushAndWrite(Object message, ChannelMatcher matcher);
+    ChannelGroupFuture writeAndFlush(Object message, ChannelMatcher matcher);
 
     /**
      * Disconnects all {@link Channel}s in this group from their remote peers.
diff --git a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java
index 8bad8555d1..3e7f8d4a4c 100644
--- a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java
+++ b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java
@@ -219,8 +219,8 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
     }
 
     @Override
-    public ChannelGroupFuture flushAndWrite(Object message) {
-        return flushAndWrite(message, ChannelMatchers.all());
+    public ChannelGroupFuture writeAndFlush(Object message) {
+        return writeAndFlush(message, ChannelMatchers.all());
     }
 
     @Override
@@ -303,7 +303,7 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
     }
 
     @Override
-    public ChannelGroupFuture flushAndWrite(Object message, ChannelMatcher matcher) {
+    public ChannelGroupFuture writeAndFlush(Object message, ChannelMatcher matcher) {
         if (message == null) {
             throw new NullPointerException("message");
         }