Revision b5f66d0e src/com/rackspacecloud/android/ViewLoadBalancerActivity.java

b/src/com/rackspacecloud/android/ViewLoadBalancerActivity.java
116 116

  
117 117
			@Override
118 118
			public void onClick(View v) {
119
				showAlert(loadBalancer.getStatus(), "The Load Balancer cannot currently be updated");
119
				showAlert(loadBalancer.getStatus(), "The load balancer cannot be updated");
120 120
			}
121 121

  
122 122
		});
......
126 126

  
127 127
			@Override
128 128
			public void onClick(View v) {
129
				showAlert(loadBalancer.getStatus(), "The Load Balancer cannot currently be deleted");
129
				showAlert(loadBalancer.getStatus(), "The load balancer cannot be deleted");
130 130
			}
131 131

  
132 132
		});
......
136 136

  
137 137
			@Override
138 138
			public void onClick(View v) {
139
				showAlert(loadBalancer.getStatus(), "The nodes cannot currently be edited");
139
				showAlert(loadBalancer.getStatus(), "The nodes cannot be edited");
140 140
			}
141 141
		});
142 142

  
......
221 221
			}
222 222
		}
223 223

  
224
		//TextView vipId = (TextView) findViewById(R.id.view_vip_id);
225
		//vipId.setText(loadBalancer.getVirtualIps().get(0).getId());
226

  
227
		//TextView address = (TextView) findViewById(R.id.view_vip_address);
228

  
229
		//TextView ipVersion = (TextView) findViewById(R.id.view_ipversion);
230
		//ipVersion.setText(loadBalancer.getVirtualIps().get(0).getIpVersion());
231

  
232
		//TextView type = (TextView) findViewById(R.id.view_vip_type);
233
		//type.setText(loadBalancer.getVirtualIps().get(0).getType());
234

  
235 224
		loadNodeData();
236 225
	}
237 226

  
......
240 229
		LinearLayout layout = (LinearLayout) this.findViewById(R.id.node_addresses);   
241 230
		layout.removeAllViews();
242 231
		ArrayList<Node> nodeIps = loadBalancer.getNodes();
232
		if(nodeIps == null){
233
			nodeIps = new ArrayList<Node>();
234
		}
243 235
		
244 236
		/*
245 237
		 * need to sort the addresses because during polling
......
265 257
				layout.addView(tv, layoutIndex++);
266 258
			}
267 259
		}
268

  
269
		/*
270
		TextView nodeID = (TextView) findViewById(R.id.view_node_id);
271
		nodeID.setText(loadBalancer.getNodes().get(0).getId());
272

  
273
		TextView address = (TextView) findViewById(R.id.view_node_address);
274
		address.setText(loadBalancer.getNodes().get(0).getAddress());
275

  
276
		TextView nodePort = (TextView) findViewById(R.id.view_node_port);
277
		nodePort.setText(loadBalancer.getNodes().get(0).getPort());
278

  
279
		TextView condition = (TextView) findViewById(R.id.view_node_condition);
280
		condition.setText(loadBalancer.getNodes().get(0).getCondition());
281

  
282
		TextView nodeStatus = (TextView) findViewById(R.id.view_node_status);
283
		nodeStatus.setText(loadBalancer.getNodes().get(0).getStatus());
284
		 */
285 260
	}
286 261

  
287 262
	//setup menu for when menu button is pressed

Also available in: Unified diff