Skip to content

Commit ec71e48

Browse files
committed
Merge pull request #3 from DevFactory/release/using-diamond-operator-fix-1
I should use java7's new features, The operator ("<>") should is called "diamond".
2 parents f9bbe14 + 58a0dee commit ec71e48

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

app/src/main/java/com/malin/rengwuxianrxjava/activity/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,14 +1299,14 @@ public void onNext(List<Contributor> contributors) {
12991299

13001300
private static final int COUNT = 10;
13011301
private static final int TIME_ALL = 5000;
1302-
private ArrayList<Long> timeList = new ArrayList<Long>();
1302+
private ArrayList<Long> timeList = new ArrayList<>();
13031303

13041304
private void method20() {
13051305

13061306
final int COUNT = 5;
13071307
final int TIME_ALL = 3000;
1308-
final ArrayList<Long> timeList = new ArrayList<Long>();
1309-
final ArrayList<Long> allList = new ArrayList<Long>();
1308+
final ArrayList<Long> timeList = new ArrayList<>();
1309+
final ArrayList<Long> allList = new ArrayList<>();
13101310

13111311
RxView.clicks(findViewById(R.id.iv_image))
13121312
.map(new Func1<Void, Long>() {

app/src/main/java/com/malin/rengwuxianrxjava/factory/DataFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ public class DataFactory {
6464
*/
6565
public static ArrayList<Student> getData() {
6666

67-
ArrayList<Student> students = new ArrayList<Student>();
67+
ArrayList<Student> students = new ArrayList<>();
6868

6969
ArrayList<Course> courses = null;
7070
Student student = null;
7171
Course course = null;
7272
for (int i = 0; i < 3; i++) {
7373

74-
courses = new ArrayList<Course>();
74+
courses = new ArrayList<>();
7575

7676
student = new Student();
7777
student.id = i;

app/src/main/java/com/malin/rengwuxianrxjava/factory/ImageNameFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class ImageNameFactory {
4646
* @return
4747
*/
4848
public static ArrayList<String> getAssetImageFolderName() {
49-
ArrayList<String> assetsFolderNameList = new ArrayList<String>();
49+
ArrayList<String> assetsFolderNameList = new ArrayList<>();
5050
assetsFolderNameList.add(FOLDER_NAME_ONE);
5151
assetsFolderNameList.add(FOLDER_NAME_TWO);
5252
assetsFolderNameList.add(FOLDER_NAME_THREE);

app/src/main/java/com/malin/rengwuxianrxjava/utils/ImageUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public static int calculateInSampleSiez(BitmapFactory.Options options, int reqWi
188188
*/
189189
public static ArrayList<String> getAssetsImageNamePathList(Context context, String folderName) {
190190

191-
ArrayList<String> imagePathList = new ArrayList<String>();
191+
ArrayList<String> imagePathList = new ArrayList<>();
192192

193193
String[] imageNameArray = getAssetsImageNameArray(context, folderName);
194194

0 commit comments

Comments
 (0)