From b6633e7e0d3a676534c5b334e9165e558b6c0cc3 Mon Sep 17 00:00:00 2001 From: Alejandro Alcalde Date: Sun, 10 Aug 2014 21:58:37 +0200 Subject: [PATCH] Fix Calling getter method * on self is slower than field access * --- SWADroid/lint.xml | 211 ++---------------- .../com/android/dataframework/core/Field.java | 4 +- .../src/es/ugr/swad/swadroid/model/Group.java | 2 +- .../downloads/FileDownloaderAsyncTask.java | 2 +- 4 files changed, 18 insertions(+), 201 deletions(-) diff --git a/SWADroid/lint.xml b/SWADroid/lint.xml index b8810ab9..ff169500 100644 --- a/SWADroid/lint.xml +++ b/SWADroid/lint.xml @@ -1,200 +1,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SWADroid/src/com/android/dataframework/core/Field.java b/SWADroid/src/com/android/dataframework/core/Field.java index 8ee3ba9e..9ce23225 100644 --- a/SWADroid/src/com/android/dataframework/core/Field.java +++ b/SWADroid/src/com/android/dataframework/core/Field.java @@ -90,8 +90,8 @@ public class Field { sql += " " + getSQLType(); if (mObligatory) sql += " not null"; - if (getTextDefault()!=null) { - sql += " DEFAULT '" + getTextDefault() + "'"; + if (mTextDefault!=null) { + sql += " DEFAULT '" + mTextDefault + "'"; } return sql; diff --git a/SWADroid/src/es/ugr/swad/swadroid/model/Group.java b/SWADroid/src/es/ugr/swad/swadroid/model/Group.java index 7c718b36..ae1b785e 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/model/Group.java +++ b/SWADroid/src/es/ugr/swad/swadroid/model/Group.java @@ -193,7 +193,7 @@ public class Group extends Model { @Override public String toString() { return "Group [name=" + groupName + ", getId()=" + getId() + ", getGroupTypeCode()=" + groupTypeCode + ", getMaxStudents()=" + maxStudents + ", getCurrentStudents()=" - + getCurrentStudents() + ", getOpen()=" + getOpen() + ", getDocumentsArea()=" + getDocumentsArea() + ", getMember()= " + getMember(); + + students + ", getOpen()=" + open + ", getDocumentsArea()=" + fileZones + ", getMember()= " + member; } /** diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java index fe55a788..8988d084 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java @@ -136,7 +136,7 @@ public class FileDownloaderAsyncTask extends AsyncTask // basename = "tmp"; try { - File output = new File(this.getDownloadDir(), this.fileName); + File output = new File(download_dir, this.fileName); if (output.exists()) { int i = 1; do {