PlaceHold, HoldDetails - removed superfluous "recipient", which is already on the...

diff --git a/Open-ILS/src/Android/core/res/layout/hold_details.xml b/Open-ILS/src/Android/core/res/layout/hold_details.xml
index bb9e32f..9bd9f38 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/hold_details.xml
+++ b/Open-ILS/src/Android/core/res/layout/hold_details.xml
@@ -25,23 +25,6 @@
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
-                        android:text="@string/recipient"
-                        />
-
-                <TextView
-                        android:id="@+id/hold_recipient"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="4"
-                        android:gravity="left"
-                        android:text="yomomma"
-                        android:layout_gravity="left"/>
-            </TableRow>
-            <TableRow>
-                <TextView
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2"
                         android:text="@string/title"
                         />
 

diff --git a/Open-ILS/src/Android/core/res/layout/place_hold.xml b/Open-ILS/src/Android/core/res/layout/place_hold.xml
index 7d52430..922a373 100644 (file)
--- a/Open-ILS/src/Android/core/res/layout/place_hold.xml
+++ b/Open-ILS/src/Android/core/res/layout/place_hold.xml
@@ -25,23 +25,6 @@
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
-                        android:text="@string/recipient"
-                        />
-
-                <TextView
-                        android:id="@+id/hold_recipient"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="4"
-                        android:gravity="left"
-                        android:layout_gravity="left"
-                        android:text="yomomma"/>
-            </TableRow>
-            <TableRow>
-                <TextView
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="2"
                         android:text="@string/title"
                         />
 

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
index b53389c..2d58d42 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/HoldDetails.java
@@ -62,7 +62,7 @@ import android.widget.Toast;
 
 public class HoldDetails extends ActionBarActivity {
 
-    private final String TAG = HoldDetails.class.getName();
+    private final String TAG = HoldDetails.class.getSimpleName();
 
     public static final int RESULT_CODE_DELETE_HOLD = 5;
 
@@ -70,16 +70,12 @@ public class HoldDetails extends ActionBarActivity {
 
     public static final int RESULT_CODE_CANCEL = 7;
 
-    private TextView recipient;
-
     private TextView title;
 
     private TextView author;
 
     private TextView physical_description;
 
-    private TextView screen_title;
-
     private AccountAccess accountAccess;
 
     private EditText expiration_date;
@@ -140,7 +136,6 @@ public class HoldDetails extends ActionBarActivity {
 
         accountAccess = AccountAccess.getAccountAccess();
 
-        recipient = (TextView) findViewById(R.id.hold_recipient);
         title = (TextView) findViewById(R.id.hold_title);
         author = (TextView) findViewById(R.id.hold_author);
         physical_description = (TextView) findViewById(R.id.hold_physical_description);
@@ -152,7 +147,6 @@ public class HoldDetails extends ActionBarActivity {
         expiration_date = (EditText) findViewById(R.id.hold_expiration_date);
         thaw_date_edittext = (EditText) findViewById(R.id.hold_thaw_date);
 
-        recipient.setText(accountAccess.userName);
         title.setText(record.title);
         author.setText(record.author);
         if (record.recordInfo != null)

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
index 84303ed..65df3b4 100644 (file)
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/holds/PlaceHold.java
@@ -61,9 +61,7 @@ import android.widget.Toast;
 
 public class PlaceHold extends ActionBarActivity {
 
-    private final String TAG = PlaceHold.class.getName();
-
-    private TextView recipient;
+    private final String TAG = PlaceHold.class.getSimpleName();
 
     private TextView title;
 
@@ -71,8 +69,6 @@ public class PlaceHold extends ActionBarActivity {
 
     private TextView physical_description;
 
-    private TextView screen_title;
-
     private AccountAccess accountAccess;
 
     private EditText expiration_date;
@@ -140,7 +136,6 @@ public class PlaceHold extends ActionBarActivity {
 
         accountAccess = AccountAccess.getAccountAccess();
 
-        recipient = (TextView) findViewById(R.id.hold_recipient);
         title = (TextView) findViewById(R.id.hold_title);
         author = (TextView) findViewById(R.id.hold_author);
         physical_description = (TextView) findViewById(R.id.hold_physical_description);
@@ -154,7 +149,6 @@ public class PlaceHold extends ActionBarActivity {
         orgSelector = (Spinner) findViewById(R.id.hold_pickup_location);
         thaw_date_edittext = (EditText) findViewById(R.id.hold_thaw_date);
 
-        recipient.setText(accountAccess.userName);
         title.setText(record.title);
         author.setText(record.author);
         physical_description.setText(record.physical_description);