Skip to content

Commit 448acff

Browse files
Change naming conventions for fileds
Summary: We used to use mPrivateField, now we use privateField Change-Id: I327a232f3d5f7c78cd289ca09a6ba500b63f172d
1 parent 7e7f808 commit 448acff

5 files changed

Lines changed: 179 additions & 181 deletions

File tree

websockets-example/src/main/java/com/appunite/socket/Main.java

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,12 @@ public class Main extends Activity implements OnClickListener {
4747
}
4848
}
4949

50-
private View mConnectButton;
51-
private View mDisconnectButton;
52-
private View mSendButton;
53-
private ListView mListView;
50+
private View connectButton;
51+
private View disconnectButton;
52+
private View sendButton;
5453

55-
private List<String> mMessages;
56-
private ArrayAdapter<String> mAdapter;
54+
private List<String> messages;
55+
private ArrayAdapter<String> adapter;
5756
private WebSocket webSocket;
5857

5958
private final WebSocketListener listener = new WebSocketListener() {
@@ -65,7 +64,7 @@ public void onConnected() throws IOException, InterruptedException, NotConnected
6564
@Override
6665
public void run() {
6766
addMessageOnList("connected");
68-
mSendButton.setEnabled(true);
67+
sendButton.setEnabled(true);
6968
}
7069
});
7170
}
@@ -137,33 +136,32 @@ public void run() {
137136
}
138137
};
139138

140-
/** Called when the activity is first created. */
141139
@Override
142140
public void onCreate(Bundle savedInstanceState) {
143141
super.onCreate(savedInstanceState);
144142
setContentView(R.layout.main);
145143

146-
mConnectButton = findViewById(R.id.connect_button);
147-
mDisconnectButton = findViewById(R.id.disconnect_button);
148-
mSendButton = findViewById(R.id.send_button);
149-
mListView = (ListView) findViewById(android.R.id.list);
144+
connectButton = findViewById(R.id.connect_button);
145+
disconnectButton = findViewById(R.id.disconnect_button);
146+
sendButton = findViewById(R.id.send_button);
147+
final ListView listView = (ListView) findViewById(android.R.id.list);
150148

151-
mMessages = new ArrayList<>();
152-
mAdapter = new ArrayAdapter<>(this,
153-
android.R.layout.simple_list_item_1, mMessages);
149+
messages = new ArrayList<>();
150+
adapter = new ArrayAdapter<>(this,
151+
android.R.layout.simple_list_item_1, messages);
154152

155-
mListView.setAdapter(mAdapter);
153+
listView.setAdapter(adapter);
156154

157-
mConnectButton.setOnClickListener(this);
158-
mDisconnectButton.setOnClickListener(this);
159-
mSendButton.setOnClickListener(this);
155+
connectButton.setOnClickListener(this);
156+
disconnectButton.setOnClickListener(this);
157+
sendButton.setOnClickListener(this);
160158

161159
webSocket = new WebSocket(listener);
162160
}
163161

164162
private void connect() {
165-
mConnectButton.setEnabled(false);
166-
mDisconnectButton.setEnabled(true);
163+
connectButton.setEnabled(false);
164+
disconnectButton.setEnabled(true);
167165
addMessageOnList("connecting");
168166

169167
new Thread(new Runnable() {
@@ -186,9 +184,9 @@ public void run() {
186184
@Override
187185
public void run() {
188186
addMessageOnList("disconnected");
189-
mSendButton.setEnabled(false);
190-
mConnectButton.setEnabled(true);
191-
mDisconnectButton.setEnabled(false);
187+
sendButton.setEnabled(false);
188+
connectButton.setEnabled(true);
189+
disconnectButton.setEnabled(false);
192190
}
193191
});
194192
break;
@@ -197,9 +195,9 @@ public void run() {
197195
@Override
198196
public void run() {
199197
addMessageOnList("connecting");
200-
mSendButton.setEnabled(false);
201-
mConnectButton.setEnabled(false);
202-
mDisconnectButton.setEnabled(true);
198+
sendButton.setEnabled(false);
199+
connectButton.setEnabled(false);
200+
disconnectButton.setEnabled(true);
203201
}
204202
});
205203

@@ -221,8 +219,8 @@ private void disconnect() {
221219
}
222220

223221
private void addMessageOnList(String msg) {
224-
mMessages.add(msg);
225-
mAdapter.notifyDataSetChanged();
222+
messages.add(msg);
223+
adapter.notifyDataSetChanged();
226224
}
227225

228226
@Override

0 commit comments

Comments
 (0)