Revision 4daf0073

b/src/com/rackspace/cloud/files/api/client/Container.java
4 4

  
5 5
/**
6 6
 * @author Phillip Toohill dead2hill@gmail.com
7
 *
7
 * 
8 8
 */
9 9
public class Container extends Entity {
10 10

  
11 11
	private static final long serialVersionUID = 5994739895998309675L;
12
	
13
	// Regular attributes 
12

  
13
	// Regular attributes
14 14
	private String name;
15 15
	private int count;
16 16
	private int bytes;
17
	
17

  
18 18
	// CDN attributes
19 19
	private boolean cdnEnabled;
20 20
	private int Ttl;
......
23 23

  
24 24
	public String toXML() {
25 25
		String xml = "";
26
		xml = "<container xmlns=\"http://docs.rackspacecloud.com/servers/api/v1.0\" name=\"" + getName() 
27
			+ "\"></server>";
26
		xml = "<container xmlns=\"http://docs.rackspacecloud.com/servers/api/v1.0\" name=\""
27
				+ getName() + "\"></server>";
28 28
		return xml;
29 29
	}
30 30

  
......
36 36
	}
37 37

  
38 38
	/**
39
	 * @param name the name to set
39
	 * @param name
40
	 *            the name to set
40 41
	 */
41 42
	public void setName(String name) {
42 43
		this.name = name;
......
50 51
	}
51 52

  
52 53
	/**
53
	 * @param count the count to set
54
	 * @param count
55
	 *            the count to set
54 56
	 */
55 57
	public void setCount(int count) {
56 58
		this.count = count;
......
64 66
	}
65 67

  
66 68
	/**
67
	 * @param bytes the bytes to set
69
	 * @param bytes
70
	 *            the bytes to set
68 71
	 */
69 72
	public void setBytes(int bytes) {
70 73
		this.bytes = bytes;
......
78 81
	}
79 82

  
80 83
	/**
81
	 * @param cdnEnabled the cdnEnabled to set
84
	 * @param cdnEnabled
85
	 *            the cdnEnabled to set
82 86
	 */
83 87
	public void setCdnEnabled(boolean cdnEnabled) {
84 88
		this.cdnEnabled = cdnEnabled;
......
92 96
	}
93 97

  
94 98
	/**
95
	 * @param ttl the ttl to set
99
	 * @param ttl
100
	 *            the ttl to set
96 101
	 */
97 102
	public void setTtl(int ttl) {
98 103
		Ttl = ttl;
......
106 111
	}
107 112

  
108 113
	/**
109
	 * @param cdnUrl the cdnUrl to set
114
	 * @param cdnUrl
115
	 *            the cdnUrl to set
110 116
	 */
111 117
	public void setCdnUrl(String cdnUrl) {
112 118
		this.cdnUrl = cdnUrl;
......
120 126
	}
121 127

  
122 128
	/**
123
	 * @param logRetention the logRetention to set
129
	 * @param logRetention
130
	 *            the logRetention to set
124 131
	 */
125 132
	public void setLogRetention(boolean logRetention) {
126 133
		this.logRetention = logRetention;
127 134
	}
128 135

  
129
	
130
}   
131

  
136
}
b/src/com/rackspace/cloud/files/api/client/parsers/ContainerXMLParser.java
86 86
				break;
87 87
			}
88 88
		}
89
		System.out.print("\"\n");
89 90

  
90 91
		for (int i = start; i < (start + length); i++) {
91 92
			currentData.append(ch[i]);
b/src/com/rackspacecloud/android/ContainerObjectsActivity.java
63 63
	public void onCreate(Bundle savedInstanceState) {
64 64
		super.onCreate(savedInstanceState);
65 65
		container = (Container) this.getIntent().getExtras().get("container");
66
		Log.v(LOG, "CDNEnabled:" + container.isCdnEnabled());
66 67
		if (container.isCdnEnabled() == true) {
67 68
			cdnEnabledIs = "true";
68 69
		} else {
......
302 303
		}
303 304
		if (requestCode == 56) {
304 305
			if (resultCode == RESULT_OK) {
305
			Intent viewIntent1 = new Intent(this, ListContainerActivity.class);
306
			startActivityForResult(viewIntent1, 56);
306
				Intent viewIntent1 = new Intent(this,
307
						ListContainerActivity.class);
308
				startActivityForResult(viewIntent1, 56);
307 309
			}
308 310
		}
309 311
	}
b/src/com/rackspacecloud/android/ListContainerActivity.java
201 201
				for (int t = 0; t < cdnContainers.size(); t++) {
202 202
					Container cdnContainer = cdnContainers.get(t);
203 203
					if (container.getName().equals(cdnContainer.getName())) {
204
						container.setCdnEnabled(true);
204
						container.setCdnEnabled(cdnContainer.isCdnEnabled());
205 205
						container.setCdnUrl(cdnContainer.getCdnUrl());
206 206
						container.setTtl(cdnContainer.getTtl());
207 207
					}
......
246 246
		public View getView(int position, View convertView, ViewGroup parent) {
247 247

  
248 248
			Container container = containers[position];
249

  
249 250
			LayoutInflater inflater = getLayoutInflater();
250 251
			View row = inflater.inflate(R.layout.listcontainerscell, parent,
251 252
					false);

Also available in: Unified diff