/ - Diff - Pithos Android Client - Greek Research and Technology Network's projects

b/AndroidManifest.xml
130	130	<activity android:name=".EditNodesActivity"></activity>
131	131	<activity android:name=".EditLoadBalancerActivity"></activity>
132	132	<activity android:name=".AddMoreNodesActivity"></activity>
	133	<activity android:name=".AddExternalNodeActivity"></activity>
133	134
134	135
135	136

     <?xml version="1.0" encoding="utf-8"?>
     <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     	android:orientation="vertical" android:layout_height="fill_parent"
     	android:layout_width="fill_parent">
     	<LinearLayout android:layout_height="wrap_content"
     		android:id="@+id/linearLayout1" android:orientation="vertical"
     		android:layout_width="fill_parent">
     		<TextView android:id="@+id/textView1" android:layout_width="wrap_content"
     			android:layout_height="wrap_content" android:text="IP Address"
     			android:layout_marginLeft="10dip" android:layout_marginTop="10dip"></TextView>
     		<EditText android:layout_height="wrap_content"
     			android:layout_width="fill_parent" android:layout_marginLeft="20dip"
     			android:layout_marginRight="30dip" android:id="@+id/ip_address"></EditText>
     		<TextView android:id="@+id/textView2" android:layout_width="wrap_content"
     			android:layout_height="wrap_content" android:layout_marginLeft="10dip"
     			android:text="Port"></TextView>
     		<EditText android:layout_width="fill_parent"
     			android:layout_height="wrap_content" android:inputType="number"
     			android:layout_marginLeft="20dip" android:layout_marginRight="30dip"
     			android:id="@+id/node_port_text">
     			<requestFocus></requestFocus>
     		</EditText>
     		<TextView android:layout_width="wrap_content" android:id="@+id/TextView01"
     			android:layout_marginLeft="10dip" android:layout_height="wrap_content"
     			android:text="Condition"></TextView>
     		<Spinner android:layout_marginLeft="20dip"
     			android:layout_height="wrap_content" android:layout_width="fill_parent"
     			android:layout_marginRight="30dip" android:id="@+id/node_condition_spinner"></Spinner>
     		<TextView android:layout_height="wrap_content"
     			android:layout_marginLeft="10dip" android:id="@+id/node_weight_label"
     			android:layout_width="wrap_content" android:text="Weight"></TextView>
     		<EditText android:layout_height="wrap_content"
     			android:layout_marginRight="30dip" android:layout_marginLeft="20dip"
     			android:inputType="number" android:layout_width="fill_parent"
     			android:id="@+id/node_weight_text"></EditText>
     		<Button android:layout_gravity="center_horizontal"
     			android:layout_marginTop="10dip" android:layout_marginBottom="10dip"
     			android:layout_width="120dip" android:text="Submit" android:id="@+id/add_node_button"
     			android:layout_height="wrap_content"></Button>
     	</LinearLayout>
     </ScrollView>

     <?xml version="1.0" encoding="utf-8"?>
     <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     	android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent">
     	android:orientation="vertical" android:layout_height="fill_parent"
     	android:layout_width="fill_parent">
     	<LinearLayout android:layout_height="wrap_content"
     		android:id="@+id/linearLayout1" android:orientation="vertical" android:layout_width="fill_parent">
     		<TextView android:id="@+id/node_name" android:layout_height="wrap_content" android:layout_width="wrap_content" android:text="CentOS1" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_marginLeft="10dip" android:layout_marginTop="10dip"></TextView>
     		<TextView android:id="@+id/textView1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="IP Address" android:layout_marginLeft="10dip" android:layout_marginTop="10dip"></TextView>
     		<Spinner android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginLeft="20dip" android:layout_marginRight="30dip" android:id="@+id/node_ip_spinner"></Spinner>
     		<TextView android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10dip" android:text="Port"></TextView>
     		<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:inputType="number" android:layout_marginLeft="20dip" android:layout_marginRight="30dip" android:id="@+id/node_port_text">
     		android:id="@+id/linearLayout1" android:orientation="vertical"
     		android:layout_width="fill_parent">
     		<TextView android:id="@+id/node_name" android:layout_height="wrap_content"
     			android:layout_width="wrap_content" android:text="CentOS1"
     			android:textAppearance="?android:attr/textAppearanceLarge"
     			android:layout_marginLeft="10dip" android:layout_marginTop="10dip"></TextView>
     		<TextView android:id="@+id/textView1" android:layout_width="wrap_content"
     			android:layout_height="wrap_content" android:text="IP Address"
     			android:layout_marginLeft="10dip" android:layout_marginTop="10dip"></TextView>
     		<Spinner android:layout_height="wrap_content"
     			android:layout_width="fill_parent" android:layout_marginLeft="20dip"
     			android:layout_marginRight="30dip" android:id="@+id/node_ip_spinner"></Spinner>
     		<TextView android:id="@+id/textView2" android:layout_width="wrap_content"
     			android:layout_height="wrap_content" android:layout_marginLeft="10dip"
     			android:text="Port"></TextView>
     		<EditText android:layout_width="fill_parent"
     			android:layout_height="wrap_content" android:inputType="number"
     			android:layout_marginLeft="20dip" android:layout_marginRight="30dip"
     			android:id="@+id/node_port_text">
     			<requestFocus></requestFocus>
     		</EditText>
     		<TextView android:layout_width="wrap_content" android:id="@+id/TextView01" android:layout_marginLeft="10dip" android:layout_height="wrap_content" android:text="Condition"></TextView>
     		<Spinner android:layout_marginLeft="20dip" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_marginRight="30dip" android:id="@+id/node_condition_spinner"></Spinner>
     		<TextView android:layout_height="wrap_content" android:layout_marginLeft="10dip" android:id="@+id/node_weight_label" android:layout_width="wrap_content" android:text="Weight"></TextView>
     		<EditText android:layout_height="wrap_content" android:layout_marginRight="30dip" android:layout_marginLeft="20dip" android:inputType="number" android:layout_width="fill_parent" android:id="@+id/node_weight_text"></EditText>
     		<Button android:layout_gravity="center_horizontal" android:layout_marginTop="10dip" android:layout_marginBottom="10dip" android:layout_width="120dip" android:text="Submit" android:id="@+id/add_node_button" android:layout_height="wrap_content"></Button>
     		<TextView android:layout_width="wrap_content" android:id="@+id/TextView01"
     			android:layout_marginLeft="10dip" android:layout_height="wrap_content"
     			android:text="Condition"></TextView>
     		<Spinner android:layout_marginLeft="20dip"
     			android:layout_height="wrap_content" android:layout_width="fill_parent"
     			android:layout_marginRight="30dip" android:id="@+id/node_condition_spinner"></Spinner>
     		<TextView android:layout_height="wrap_content"
     			android:layout_marginLeft="10dip" android:id="@+id/node_weight_label"
     			android:layout_width="wrap_content" android:text="Weight"></TextView>
     		<EditText android:layout_height="wrap_content"
     			android:layout_marginRight="30dip" android:layout_marginLeft="20dip"
     			android:inputType="number" android:layout_width="fill_parent"
     			android:id="@+id/node_weight_text"></EditText>
     		<Button android:layout_gravity="center_horizontal"
     			android:layout_marginTop="10dip" android:layout_marginBottom="10dip"
     			android:layout_width="120dip" android:text="Submit" android:id="@+id/add_node_button"
     			android:layout_height="wrap_content"></Button>
     	</LinearLayout>
     </ScrollView>

     					android:layout_height="417dp" android:id="@android:id/list"></ListView>
     			</LinearLayout>
     		</ScrollView>
     		<Button android:layout_height="wrap_content" android:layout_alignParentBottom="true"
     			android:layout_centerInParent="true" android:layout_marginBottom="15dip"
     			android:layout_width="120dp" android:text="Add Nodes"
     			android:layout_marginTop="5dip" android:id="@+id/submit_nodes_button"></Button>
     		<LinearLayout android:id="@+id/linearLayout1"
     			android:layout_width="wrap_content" android:layout_height="wrap_content"
     			android:layout_alignParentRight="true"
     			android:layout_alignParentLeft="true" android:layout_below="@+id/node_scroll"
     			android:gravity="center_horizontal">
     			<Button android:id="@+id/submit_nodes_button"
     				android:layout_marginBottom="15dip" android:layout_height="wrap_content"
     				android:layout_marginTop="5dip" android:text="Add Selected Nodes"
     				android:layout_width="145dip"></Button>
     			<Button android:layout_marginBottom="15dip"
     				android:layout_height="wrap_content" android:layout_marginTop="5dip"
     				android:id="@+id/add_external_node" android:text="Add External Node"
     				android:layout_width="145dip"></Button>
     		</LinearLayout>
     	</RelativeLayout>
     </LinearLayout>

     <?xml version="1.0" encoding="utf-8"?>
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     	android:orientation="vertical" android:layout_width="fill_parent"
     	android:layout_height="fill_parent">
     	<RelativeLayout android:layout_width="fill_parent"
     		android:id="@+id/nodes_relative" android:layout_height="fill_parent">
     		<ScrollView android:layout_height="wrap_content"
     			android:orientation="vertical" android:layout_width="wrap_content"
     			android:id="@+id/node_scroll" android:layout_above="@+id/submit_nodes_button">
     			<LinearLayout android:layout_width="fill_parent"
     				android:id="@+id/nodes_linear_layout" android:layout_height="fill_parent">
     				<ListView android:layout_weight="1" android:layout_width="fill_parent"
     					android:cacheColorHint="@android:color/transparent"
     					android:layout_height="417dp" android:id="@android:id/list"></ListView>
     			</LinearLayout>
     		</ScrollView>
     		<LinearLayout android:id="@+id/linearLayout1"
     			android:layout_width="wrap_content" android:layout_height="wrap_content"
     			android:layout_alignParentRight="true"
     			android:layout_alignParentLeft="true" android:layout_below="@+id/node_scroll"
     			android:gravity="center_horizontal">
     			<Button android:id="@+id/submit_nodes_button"
     				android:layout_marginBottom="15dip" android:layout_height="wrap_content"
     				android:layout_marginTop="5dip" android:layout_width="145dip" android:text="Add More Nodes"></Button>
     		</LinearLayout>
     	</RelativeLayout>
     </LinearLayout>

     <?xml version="1.0" encoding="utf-8"?>
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     	android:orientation="horizontal" android:layout_width="fill_parent"
     	android:layout_height="64dip">
     	<ImageView android:id="@+id/icon" android:layout_width="37px"
     		android:paddingLeft="0px" android:paddingRight="0px"
     		android:paddingTop="0px" android:layout_marginRight="10px"
     		android:layout_marginLeft="10px" android:layout_marginTop="13px"
     		android:layout_height="37px" android:src="@drawable/ubuntu_icon" />
     <RelativeLayout android:id="@+id/LinearLayout1" xmlns:android="http://schemas.android.com/apk/res/android"
     	android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
         <TextView android:textColor="#FFFFFF" android:id="@+id/label" android:layout_height="wrap_content" android:text="Server Name" android:textSize="24sp" android:lines="1" android:layout_width="wrap_content" android:layout_alignParentTop="true" android:layout_toRightOf="@+id/add_node_checkbox" android:layout_marginLeft="14dp" android:layout_marginTop="1dip"></TextView>
         <CheckBox android:id="@+id/add_node_checkbox" android:layout_height="wrap_content" android:focusable="false" android:layout_width="wrap_content" android:layout_alignParentTop="true" android:layout_alignParentLeft="true" android:layout_marginLeft="16dp"></CheckBox>
         <TextView android:textColor="#FFFFFF" android:id="@+id/sublabel" android:layout_height="wrap_content" android:text="256 server - CentOS 5.3" android:textSize="12sp" android:layout_width="wrap_content" android:layout_below="@+id/label" android:layout_alignLeft="@+id/label" android:paddingBottom="5dip"></TextView>
     	<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
     		android:orientation="vertical" android:layout_width="fill_parent"
     		android:layout_height="fill_parent">
     		<TableRow>
     			<RelativeLayout android:id="@+id/relativeLayout1"
     				android:layout_width="wrap_content" android:layout_height="wrap_content">
     				<CheckBox android:layout_width="wrap_content"
     					android:layout_height="wrap_content" android:layout_centerVertical="true"
     					android:layout_alignParentRight="true" android:layout_marginRight="10dip"
     					android:id="@+id/add_node_checkbox" android:focusable="false"></CheckBox>
     				<TextView android:layout_width="wrap_content" android:id="@+id/label"
     					android:layout_height="wrap_content" android:textSize="24sp"
     					android:textColor="#FFFFFF" android:layout_centerVertical="true"
     					android:layout_alignParentLeft="true" android:layout_marginLeft="16dp"
     					android:layout_toLeftOf="@+id/checkBox1" android:lines="1"></TextView>
     			</RelativeLayout>
     		</TableRow>
     		<TableRow>
     			<TextView android:id="@+id/sublabel" android:layout_width="wrap_content"
     				android:layout_height="wrap_content" android:layout_marginTop="0px"
     				android:textColor="#FFFFFF" android:text="256 server - CentOS 5.3"
     				android:textSize="12sp" />
     		</TableRow>
     	</TableLayout>
     </LinearLayout>
     </RelativeLayout>

     package com.rackspacecloud.android;
     import android.app.Activity;
     import android.content.Intent;
     import android.os.Bundle;
     import android.util.Log;
     import android.view.View;
     import android.view.Window;
     import android.view.View.OnClickListener;
     import android.widget.AdapterView;
     import android.widget.ArrayAdapter;
     import android.widget.Button;
     import android.widget.EditText;
     import android.widget.Spinner;
     import android.widget.TextView;
     import android.widget.AdapterView.OnItemSelectedListener;
     public class AddExternalNodeActivity extends CloudActivity {
     	private final String[] CONDITIONS = {"Enabled", "Disabled", "Draining"};
     	private String name;
     	private String selectedPort;
     	private String selectedIp;
     	private String selectedWeight;
     	private boolean weighted;
     	private String selectedCondition;
     	private Spinner conditionSpinner;
     	private EditText ipAddress;
     	private EditText weightText;
     	public void onCreate(Bundle savedInstanceState) {
     		super.onCreate(savedInstanceState);
     		requestWindowFeature(Window.FEATURE_NO_TITLE);
     		setContentView(R.layout.addexternalnode);
     		weighted = (Boolean) this.getIntent().getExtras().get("weighted");
     		restoreState(savedInstanceState);
+    	}
     	protected void restoreState(Bundle state) {
     		super.restoreState(state);
     		setupInputs();
+    	}
     	private void setupInputs(){
     		ipAddress = (EditText) findViewById(R.id.ip_address);
     		weightText = (EditText) findViewById(R.id.node_weight_text);
     		//if algorithm is not weighted then then node's weight will be null
     		if(!weighted){
     			TextView weightLabel = (TextView) findViewById(R.id.node_weight_label);
     			weightLabel.setVisibility(View.GONE);
     			weightText.setVisibility(View.GONE);
+    		}
     		loadConditionSpinner();
     		setUpButton();
+    	}
     	private void setUpButton(){
     		Button submit = (Button) findViewById(R.id.add_node_button);
     		submit.setOnClickListener(new OnClickListener() {
     			@Override
     			public void onClick(View v) {
     				selectedIp = ipAddress.getText().toString();
     				selectedPort = ((EditText)findViewById(R.id.node_port_text)).getText().toString();
     				selectedWeight = weightText.getText().toString();
     				if(!validPort()){
     					showAlert("Error", "Must have a protocol port number that is between 1 and 65535.");
     				} else if(!(weightText.getVisibility() == View.GONE || (weightText.getVisibility() != View.GONE && validWeight(selectedWeight)))){
     					showAlert("Error", "Weight must be between 1 and 100.");
     				} else if(ipAddress.getText().toString().equals("")){
     					//TODO use regex to validate the ip for IPV4 and IPV6
     					showAlert("Error", "Enter an IP Address");
+    				}
     				else{
     					Intent data = new Intent();
     					data.putExtra("nodeIp", selectedIp);
     					data.putExtra("nodePort", selectedPort);
     					data.putExtra("nodeCondition", selectedCondition);
     					data.putExtra("nodeWeight", selectedWeight);
     					setResult(RESULT_OK, data);
     					finish();
+    				}
+    			}
     		});
+    	}
     	public void onBackPressed(){
     		setResult(RESULT_CANCELED);
     		finish();
+    	}
     	private void loadConditionSpinner(){
     		conditionSpinner = (Spinner) findViewById(R.id.node_condition_spinner);
     		ArrayAdapter<String> conditionAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, CONDITIONS);
     		conditionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
     		conditionSpinner.setAdapter(conditionAdapter);
     		conditionSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
     			@Override
     			public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
     				selectedCondition = CONDITIONS[pos];
+    			}
     			@Override
     			public void onNothingSelected(AdapterView<?> arg0) {
+    			}
     		});
+    	}
     	private boolean validPort(){
     		return !selectedPort.equals("") && Integer.valueOf(selectedPort) > 0 && Integer.valueOf(selectedPort) < 65536;
+    	}
     	private Boolean validWeight(String weight){
     		if(weight.equals("")){
     			return false;
+    		}
     		else{
     			int w = Integer.valueOf(weight);
     			return w >= 1 && w <= 100 ;
+    		}
+    	}
+    }

     import android.widget.LinearLayout;
     import android.widget.ListView;
     import android.widget.CompoundButton.OnCheckedChangeListener;
     import android.widget.ImageView;
     import android.widget.TextView;
     public class AddMoreNodesActivity extends CloudListActivity {
     	private static final int ADD_NODE_CODE = 178;
     	private Server[] servers;
     	private static final int ADD_EXTERNAL_NODE_CODE = 188;
     	private ArrayList<Server> servers;
     	private int lastCheckedPos;
     	private ArrayList<Node> nodes;
     	private ArrayList<Node> nodesToAdd;
-...
     	@Override
     	protected void onSaveInstanceState(Bundle outState) {
     		super.onSaveInstanceState(outState);
     		outState.putSerializable("nodes", nodes);
     		outState.putSerializable("loadBalancer", loadBalancer);
     		outState.putSerializable("nodesToAdd", nodesToAdd);
-...
     				nodes = new ArrayList<Node>();
+    			}
+    		}
     		if (state != null && state.containsKey("loadBalancer")){
     			loadBalancer = (LoadBalancer) state.getSerializable("loadBalancer");
     			if(loadBalancer == null){
     				loadBalancer = new LoadBalancer();
+    			}
+    		}
     		if (state != null && state.containsKey("nodesToAdd")){
     			nodesToAdd = (ArrayList<Node>) state.getSerializable("nodesToAdd");
+    		}
-...
+    		}
     		if (state != null && state.containsKey("servers") && state.getSerializable("servers") != null) {
     			servers = (Server[]) state.getSerializable("servers");
     			if (servers.length == 0) {
     			servers = (ArrayList<Server>) state.getSerializable("servers");
     			if (servers.size() == 0) {
     				displayNoServersCell();
     			} else {
     				getListView().setDividerHeight(1); // restore divider lines
-...
+    		}
     		Button submitNodes = (Button) findViewById(R.id.submit_nodes_button);
     		submitNodes.setText("Submit");
     		submitNodes.setOnClickListener(new OnClickListener() {
     			@Override
     			public void onClick(View v) {
     				new AddNodesTask().execute();
     				if(nodesToAdd.size() == 0){
     					finish();
     				} else {
     					new AddNodesTask().execute();
+    				}
+    			}
     		});
     		Button addExternalNode = (Button) findViewById(R.id.add_external_node);
     		addExternalNode.setOnClickListener(new OnClickListener() {
     			@Override
     			public void onClick(View v) {
     				Intent viewIntent = new Intent(getContext(), AddExternalNodeActivity.class);
     				viewIntent.putExtra("weighted", false);
     				startActivityForResult(viewIntent, ADD_EXTERNAL_NODE_CODE);
+    			}
     		});
+    	}
-...
     		if (servers == null) {
     			servers = new ArrayList<Server>();
+    		}
     		for(int i = 0; i < servers.size(); i++) {
     			/*
     			 * if all the IP's of a server are
-...
     				servers.remove(i);
+    			}
+    		}
     		String[] serverNames = new String[servers.size()];
     		this.servers = new Server[servers.size()];
     		this.servers = new ArrayList<Server>();
     		for(int i = 0; i < servers.size(); i++){
     			serverNames[i] = servers.get(i).getName();
     			this.servers[i] = servers.get(i);
     			this.servers.add(i, servers.get(i));
+    		}
     		if (serverNames.length == 0) {
     			displayNoServersCell();
     		} else {
-...
     		public View getView(int position, View convertView, ViewGroup parent) {
     			final Server server = servers[position];
     			final Server server = servers.get(position);
     			LayoutInflater inflater = getLayoutInflater();
     			View row = inflater.inflate(R.layout.listservernodecell, parent, false);
-...
     			label.setText(server.getName());
     			TextView sublabel = (TextView) row.findViewById(R.id.sublabel);
     			sublabel.setText(server.getFlavor().getName() + " - " + server.getImage().getName());
     			ImageView icon = (ImageView) row.findViewById(R.id.icon);
     			icon.setImageResource(server.getImage().iconResourceId());
     			if(server.getName().equals("External Node")){
     				sublabel.setText(server.getPrivateIpAddresses()[0]);
     			} else {
     				sublabel.setText(server.getFlavor().getName() + " - " + server.getImage().getName());
+    			}
     			String[] publicIp = server.getPublicIpAddresses();
     			String[] privateIp = server.getPrivateIpAddresses();
     			if(publicIp == null){
     				publicIp = new String[0];
+    			}
     			if(privateIp == null){
     				privateIp = new String[0];
+    			}
     			ArrayList<String> ipAddressList = new ArrayList<String>();
     			for(int i = 0; i < privateIp.length; i++){
     				if(!nodeHasAddress(privateIp[i])){
-...
     			final String[] ipAddresses = ipAddressList.toArray(new String[ipAddressList.size()]);
     			final int pos = position;
     			CheckBox add = (CheckBox) row.findViewById(R.id.add_node_checkbox);
     			if(inToAddList(server)){
     				add.setChecked(true);
+    			}
     			add.setOnCheckedChangeListener(new OnCheckedChangeListener() {
     				@Override
-...
     						startActivityForResult(viewIntent, ADD_NODE_CODE);
+    					}
     					else{
     						Log.d("info", "before removing node, size is " + nodesToAdd.size());
     						removeNodeFromList(server);
     						Log.d("info", "after removing node, size is " + nodesToAdd.size());
     						if(server.getName().equals("External Node")){
     							servers.remove(server);
     							setServerList(servers);
+    						}
+    					}
+    				}
     			});
     			return(row);
+    		}
     		/*
     		 *  need to remove by id because that is
     		 *  what is unique
-...
+    		}
     		return false;
+    	}
     	private boolean inToAddList(Server server){
     		for(Node node : nodesToAdd){
     			if(serverHasIp(server, node.getAddress())){
-...
     		return false;
+    	}
     	private class AddNodesTask extends AsyncTask<Void, Void, HttpBundle> {
     		private CloudServersException exception;
     		protected void onPreExecute(){
     			showDialog();
+    		}
     		@Override
     		protected HttpBundle doInBackground(Void... arg0) {
     			HttpBundle bundle = null;
-...
     	private class LoadServersTask extends AsyncTask<Void, Void, ArrayList<Server>> {
     		private CloudServersException exception;
     		@Override
     		protected void onPreExecute(){
     			showDialog();
+    		}
     		@Override
     		protected ArrayList<Server> doInBackground(Void... arg0) {
     			ArrayList<Server> servers = null;
-...
+    			}
     			return servers;
+    		}
     		@Override
     		protected void onPostExecute(ArrayList<Server> result) {
     			hideDialog();
-...
+    		}
+    	}
     	private String getNameFromIp(String address){
     		for(Server s: servers){
     			if(serverHasIp(s, address)){
     				return s.getName();
+    			}
+    		}
     		return "";
+    	}
     	private boolean isCloudServerIp(String address){
     		for(Server s : servers){
     			if(serverHasIp(s, address)){
     				return true;
+    			}
+    		}
     		return false;
+    	}
     	protected void onActivityResult(int requestCode, int resultCode, Intent data){
     		int pos = lastCheckedPos;
     		if(requestCode == ADD_NODE_CODE && resultCode == RESULT_OK){
     			Node node = new Node();
     			node.setAddress(data.getStringExtra("nodeIp"));
     			node.setCondition(data.getStringExtra("nodeCondition"));
     			node.setName(servers[pos].getName());
     			node.setName(servers.get(pos).getName());
     			node.setPort(data.getStringExtra("nodePort"));
     			Log.d("info", "setting the weight in addmore to " + data.getStringExtra("nodeWeight"));
     			node.setWeight(data.getStringExtra("nodeWeight"));
-...
     			CheckBox checkBox = (CheckBox)row.findViewById(R.id.add_node_checkbox);
     			checkBox.setChecked(false);
+    		}
+    	}
     		else if(requestCode == ADD_EXTERNAL_NODE_CODE && resultCode == RESULT_OK){
     			Node node = new Node();
     			node.setAddress(data.getStringExtra("nodeIp"));
     			node.setCondition(data.getStringExtra("nodeCondition"));
     			node.setName("External Node");
     			node.setPort(data.getStringExtra("nodePort"));
     			node.setWeight(data.getStringExtra("nodeWeight"));
     			/*
     			 * If the ip is from a cloud server, alert to user
     			 * so they can select it from there
     			 */
     			if(!isCloudServerIp(node.getAddress())){
     				nodesToAdd.add(node);
     				//Add it to server list so it display in the listview
     				Server server = new Server();
     				server.setName("External Node");
     				String[] ip = {data.getStringExtra("nodeIp")};
     				server.setPrivateIpAddresses(ip);
     				servers.add(server);
     			} else {
     				showAlert("Error", "This IP belongs to a cloud server: \"" + getNameFromIp(node.getAddress())
     						+ "\", please select it from the list.");
+    			}
+    		}
+    	}
+    }

     import android.content.Intent;
     import android.os.AsyncTask;
     import android.os.Bundle;
     import android.util.Log;
     import android.view.LayoutInflater;
     import android.view.View;
     import android.view.View.OnClickListener;
-...
     import android.widget.LinearLayout;
     import android.widget.ListView;
     import android.widget.CompoundButton.OnCheckedChangeListener;
     import android.widget.ImageView;
     import android.widget.TextView;
     public class AddNodesActivity extends CloudListActivity {
     	private static final int ADD_NODE_CODE = 178;
     	private static final int ADD_EXTERNAL_NODE_CODE = 188;
     	private Server[] servers;
     	private ArrayList<Server> servers;
     	private int lastCheckedPos;
     	private ArrayList<Node> nodes;
-...
+    		}
     		if (state != null && state.containsKey("servers")) {
     			servers = (Server[]) state.getSerializable("servers");
     			if (servers.length == 0) {
     			servers = (ArrayList<Server>) state.getSerializable("servers");
     			if (servers.size() == 0) {
     				displayNoServersCell();
     			} else {
     				getListView().setDividerHeight(1); // restore divider lines
-...
     				finish();
+    			}
     		});
     		Button addExternalNode = (Button) findViewById(R.id.add_external_node);
     		addExternalNode.setOnClickListener(new OnClickListener() {
     			@Override
     			public void onClick(View v) {
     				Intent viewIntent = new Intent(getContext(), AddExternalNodeActivity.class);
     				viewIntent.putExtra("weighted", false);
     				startActivityForResult(viewIntent, ADD_EXTERNAL_NODE_CODE);
+    			}
     		});
+    	}
     	@Override
-...
     			servers = new ArrayList<Server>();
+    		}
     		String[] serverNames = new String[servers.size()];
     		this.servers = new Server[servers.size()];
     		this.servers = new ArrayList<Server>();
     		if (servers != null) {
     			for (int i = 0; i < servers.size(); i++) {
     				Server server = servers.get(i);
     				this.servers[i] = server;
     				this.servers.add(i, server);
     				serverNames[i] = server.getName();
+    			}
+    		}
-...
     			if (exception != null) {
     				showAlert("Error", exception.getMessage());
+    			}
     			//Add the external nodes
     			for(int i = 0; i < nodes.size(); i++){
     				if(nodes.get(i).getName().equals("External Node")){
     					Server server = new Server();
     					server.setName("External Node");
     					String[] ip = {nodes.get(i).getAddress()};
     					server.setPrivateIpAddresses(ip);
     					result.add(server);
+    				}
+    			}
     			setServerList(result);
+    		}
+    	}
-...
     		public View getView(int position, View convertView, ViewGroup parent) {
     			final Server server = servers[position];
     			final Server server = servers.get(position);
     			LayoutInflater inflater = getLayoutInflater();
     			View row = inflater.inflate(R.layout.listservernodecell, parent, false);
-...
     			label.setText(server.getName());
     			TextView sublabel = (TextView) row.findViewById(R.id.sublabel);
     			sublabel.setText(server.getFlavor().getName() + " - " + server.getImage().getName());
     			ImageView icon = (ImageView) row.findViewById(R.id.icon);
     			icon.setImageResource(server.getImage().iconResourceId());
     			if(server.getName().equals("External Node")){
     				sublabel.setText(server.getPrivateIpAddresses()[0]);
     			} else {
     				sublabel.setText(server.getFlavor().getName() + " - " + server.getImage().getName());
+    			}
     			String[] publicIp = server.getPublicIpAddresses();
     			String[] privateIp = server.getPrivateIpAddresses();
     			if(publicIp == null){
     				publicIp = new String[0];
+    			}
     			if(privateIp == null){
     				privateIp = new String[0];
+    			}
     			final String[] ipAddresses = new String[privateIp.length + publicIp.length];
     			for(int i = 0; i < privateIp.length; i++){
-...
+    					}
     					else{
     						removeNodeFromList(server);
     						if(server.getName().equals("External Node")){
     							servers.remove(server);
     							setServerList(servers);
+    						}
+    					}
+    				}
     			});
-...
+    				}
+    			}
+    		}
+    	}
     		private boolean serverHasIp(Server server, String address){
     			String[] addresses = server.getPrivateIpAddresses();
     	private String getNameFromIp(String address){
     		for(Server s: servers){
     			if(serverHasIp(s, address)){
     				return s.getName();
+    			}
+    		}
     		return "";
+    	}
     	private boolean isCloudServerIp(String address){
     		for(Server s : servers){
     			if(serverHasIp(s, address)){
     				return true;
+    			}
+    		}
     		return false;
+    	}
     	private boolean serverHasIp(Server server, String address){
     		String[] addresses = server.getPrivateIpAddresses();
     		if(addresses != null){
     			for(int i = 0; i < addresses.length; i++){
     				if(addresses[i].equals(address)){
     					return true;
+    				}
+    			}
     			addresses = server.getPublicIpAddresses();
+    		}
     		addresses = server.getPublicIpAddresses();
     		if(addresses != null){
     			for(int i = 0; i < addresses.length; i++){
     				if(addresses[i].equals(address)){
     					return true;
+    				}
+    			}
     			return false;
+    		}
     		return false;
+    	}
     	protected void onActivityResult(int requestCode, int resultCode, Intent data){
     		int pos = lastCheckedPos;
     		if(requestCode == ADD_NODE_CODE && resultCode == RESULT_OK){
     			Node node = new Node();
     			node.setAddress(data.getStringExtra("nodeIp"));
     			node.setCondition(data.getStringExtra("nodeCondition"));
     			node.setName(servers[pos].getName());
     			node.setName(servers.get(pos).getName());
     			node.setPort(data.getStringExtra("nodePort"));
     			Log.d("info", "the node weight is " + data.getStringExtra("nodeWeight"));
     			node.setWeight(data.getStringExtra("nodeWeight"));
     			nodes.add(node);
+    		}
-...
     			CheckBox checkBox = (CheckBox)row.findViewById(R.id.add_node_checkbox);
     			checkBox.setChecked(false);
+    		}
     		else if(requestCode == ADD_EXTERNAL_NODE_CODE && resultCode == RESULT_OK){
     			Node node = new Node();
     			node.setAddress(data.getStringExtra("nodeIp"));
     			node.setCondition(data.getStringExtra("nodeCondition"));
     			node.setName("External Node");
     			node.setPort(data.getStringExtra("nodePort"));
     			node.setWeight(data.getStringExtra("nodeWeight"));
     			/*
     			 * If the ip is from a cloud server, alert to user
     			 * so they can select it from there
     			 */
     			if(!isCloudServerIp(node.getAddress())){
     				nodes.add(node);
     				//Add it to server list so it display in the listview
     				Server server = new Server();
     				server.setName("External Node");
     				String[] ip = {data.getStringExtra("nodeIp")};
     				server.setPrivateIpAddresses(ip);
     				servers.add(server);
     			} else {
     				showAlert("Error", "This IP belongs to a cloud server: \"" + getNameFromIp(node.getAddress())
     						+ "\", please select it from the list.");
+    			}
+    		}
+    	}

     	@Override
     	public void onCreate(Bundle savedInstanceState) {
     		super.onCreate(savedInstanceState);
     		setContentView(R.layout.addnodes);
     		setContentView(R.layout.editnodes);
     		nodes = (ArrayList<Node>) this.getIntent().getExtras().get("nodes");
     		loadBalancer = (LoadBalancer) this.getIntent().getExtras().get("loadBalancer");
     		displayNodes();

     			@Override
     			public void onClick(View v) {
     				showAlert(loadBalancer.getStatus(), "The Load Balancer cannot currently be updated");
     				showAlert(loadBalancer.getStatus(), "The load balancer cannot be updated");
+    			}
     		});
-...
     			@Override
     			public void onClick(View v) {
     				showAlert(loadBalancer.getStatus(), "The Load Balancer cannot currently be deleted");
     				showAlert(loadBalancer.getStatus(), "The load balancer cannot be deleted");
+    			}
     		});
-...
     			@Override
     			public void onClick(View v) {
     				showAlert(loadBalancer.getStatus(), "The nodes cannot currently be edited");
     				showAlert(loadBalancer.getStatus(), "The nodes cannot be edited");
+    			}
     		});
-...
+    			}
+    		}
     		//TextView vipId = (TextView) findViewById(R.id.view_vip_id);
     		//vipId.setText(loadBalancer.getVirtualIps().get(0).getId());
     		//TextView address = (TextView) findViewById(R.id.view_vip_address);
     		//TextView ipVersion = (TextView) findViewById(R.id.view_ipversion);
     		//ipVersion.setText(loadBalancer.getVirtualIps().get(0).getIpVersion());
     		//TextView type = (TextView) findViewById(R.id.view_vip_type);
     		//type.setText(loadBalancer.getVirtualIps().get(0).getType());
     		loadNodeData();
+    	}
-...
     		LinearLayout layout = (LinearLayout) this.findViewById(R.id.node_addresses);
     		layout.removeAllViews();
     		ArrayList<Node> nodeIps = loadBalancer.getNodes();
     		if(nodeIps == null){
     			nodeIps = new ArrayList<Node>();
+    		}
     		/*
     		 * need to sort the addresses because during polling
-...
     				layout.addView(tv, layoutIndex++);
+    			}
+    		}
     		/*
     		TextView nodeID = (TextView) findViewById(R.id.view_node_id);
     		nodeID.setText(loadBalancer.getNodes().get(0).getId());
     		TextView address = (TextView) findViewById(R.id.view_node_address);
     		address.setText(loadBalancer.getNodes().get(0).getAddress());
     		TextView nodePort = (TextView) findViewById(R.id.view_node_port);
     		nodePort.setText(loadBalancer.getNodes().get(0).getPort());
     		TextView condition = (TextView) findViewById(R.id.view_node_condition);
     		condition.setText(loadBalancer.getNodes().get(0).getCondition());
     		TextView nodeStatus = (TextView) findViewById(R.id.view_node_status);
     		nodeStatus.setText(loadBalancer.getNodes().get(0).getStatus());
     		 */
+    	}
     	//setup menu for when menu button is pressed

Synnefo » Pithos Android Client

Revision b5f66d0e