Revision 038ac9a4 src/com/rackspace/cloud/files/api/client/parsers/ContainerObjectXMLparser.java

b/src/com/rackspace/cloud/files/api/client/parsers/ContainerObjectXMLparser.java
20 20

  
21 21
	private ContainerObjects object;
22 22
	private ArrayList<ContainerObjects> files;
23
	private Map<String,String> metadata;
23
	private Map<String, String> metadata;
24 24
	private String key;
25
	
26 25

  
27 26
	private StringBuffer currentData;
28 27
	public String LOG = "ViewFilesXMLparser";
......
59 58
				Log.d(LOG, object.toString());
60 59
				files.add(object);
61 60
			}
62
		}else if ("x_object_meta".equals(name)) {
63
			if(object!=null){
61
		} else if ("x_object_meta".equals(name)) {
62
			if (object != null) {
64 63
				object.setMetadata(metadata);
65 64
				metadata = null;
66 65
			}
67 66

  
68
		}
69
		else if ("key".equals(name)&&metadata!=null) {
67
		} else if ("key".equals(name) && metadata != null) {
70 68
			key = value;
71
		}
72
		else if ("value".equals(name)&&metadata!=null) {
73
			if(key!=null)
74
				metadata.put(key,value);
75
		}
76
		else if ("name".equals(name)) {
69
		} else if ("value".equals(name) && metadata != null) {
70
			if (key != null)
71
				metadata.put(key, value);
72
		} else if ("name".equals(name)) {
77 73
			object.setCName(value);
78 74
		} else if ("content_type".equals(name)) {
79 75
			object.setContentType(value);
......
85 81
			object.setLastMod(value);
86 82

  
87 83
		}
88
		//x_object_modified_by
89
		//x_object_version
90
		//x_object_hash
91
		//x_object_uuid
92
		//x_object_version_timestamp
93
		//x_object_sharing
84
		// x_object_modified_by
85
		// x_object_version
86
		// x_object_hash
87
		// x_object_uuid
88
		// x_object_version_timestamp
89
		// x_object_sharing
94 90
		else if ("x_object_modified_by".equals(name)) {
95 91
			object.setModifiedBy(value);
96 92

  
97
		}
98
		else if ("x_object_version".equals(name)) {
93
		} else if ("x_object_version".equals(name)) {
99 94
			object.setVersion(value);
100 95

  
101
		}
102
		else if ("x_object_hash".equals(name)) {
96
		} else if ("x_object_hash".equals(name)) {
103 97
			object.setObjectHash(value);
104 98

  
105
		}
106
		else if ("x_object_uuid".equals(name)) {
99
		} else if ("x_object_uuid".equals(name)) {
107 100
			object.setObjectUUID(value);
108 101

  
109
		}
110
		else if ("x_object_public".equals(name)) {
102
		} else if ("x_object_public".equals(name)) {
111 103
			object.setIsPublic(value);
112
		}
113
		else if ("x_object_version_timestamp".equals(name)) {
104
		} else if ("x_object_version_timestamp".equals(name)) {
114 105
			object.setVersionTimestamp(value);
115 106

  
116
		}
117
		else if ("x_object_sharing".equals(name)) {
107
		} else if ("x_object_sharing".equals(name)) {
118 108
			object.setObjectSharing(value);
119 109

  
120 110
		}
......
122 112

  
123 113
	public void characters(char ch[], int start, int length) {
124 114

  
125
		//Log.d("Rackspace-Cloud", "Characters:    \"");
115
		// Log.d("Rackspace-Cloud", "Characters:    \"");
126 116

  
127 117
		for (int i = start; i < start + length; i++) {
128 118
			switch (ch[i]) {
129 119
			case '\\':
130
				//Log.d("Rackspace-Cloud", "\\\\");
120
				// Log.d("Rackspace-Cloud", "\\\\");
131 121
				break;
132 122
			case '"':
133
				//Log.d("Rackspace-Cloud", "\\\"");
123
				// Log.d("Rackspace-Cloud", "\\\"");
134 124
				break;
135 125
			case '\n':
136
				//Log.d("Rackspace-Cloud", "\\n");
126
				// Log.d("Rackspace-Cloud", "\\n");
137 127
				break;
138 128
			case '\r':
139
				//Log.d("Rackspace-Cloud", "\\r");
129
				// Log.d("Rackspace-Cloud", "\\r");
140 130
				break;
141 131
			case '\t':
142
				//Log.d("Rackspace-Cloud", "\\t");
132
				// Log.d("Rackspace-Cloud", "\\t");
143 133
				break;
144 134
			default:
145
				//Log.d("Rackspace-Cloud", String.valueOf(ch[i]));
135
				// Log.d("Rackspace-Cloud", String.valueOf(ch[i]));
146 136
				break;
147 137
			}
148 138
		}
149
		//Log.d("Rackspace-Cloud", "\"\n");
139
		// Log.d("Rackspace-Cloud", "\"\n");
150 140
		// String strCharacters = new String(ch, start, length);
151 141
		for (int i = start; i < (start + length); i++) {
152 142
			currentData.append(ch[i]);

Also available in: Unified diff