Perform clean code of runtime/bundles/org.eclipse.core.contenttype

Author: eclipse-platform-bot

runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/ContentDescription.java

@@ -35,78 +35,95 @@ public ContentDescription(QualifiedName[] requested, IContentTypeInfo contentTyp
 		if (requested.length > 1) {
 			keys = requested;
 			values = new Object[requested.length];
-		} else if (requested.length == 1)
+		} else if (requested.length == 1) {
 			keys = requested[0];
 		// if requested.length == 0 then keys == null (no options to describe!)
+		}
 	}
 
 	private void assertMutable() {
-		if ((flags & FLAG_IMMUTABLE) != 0)
+		if ((flags & FLAG_IMMUTABLE) != 0) {
 			throw new IllegalStateException("Content description is immutable"); //$NON-NLS-1$
+		}
 	}
 
 	@Override
 	public String getCharset() {
 		byte[] bom = (byte[]) getProperty(BYTE_ORDER_MARK);
-		if (bom == BOM_UTF_8)
+		if (bom == BOM_UTF_8) {
 			return CHARSET_UTF_8;
-		else if (bom == BOM_UTF_16BE || bom == BOM_UTF_16LE)
+		} else if (bom == BOM_UTF_16BE || bom == BOM_UTF_16LE) {
 			// UTF-16 will properly recognize the BOM
 			return CHARSET_UTF_16;
+		}
 		return (String) getProperty(CHARSET);
 	}
 
 	private Object getDescribedProperty(QualifiedName key) {
 		// no values have been set
-		if (values == null)
+		if (values == null) {
 			return null;
+		}
 		// a single property may have been set
-		if (keys instanceof QualifiedName)
+		if (keys instanceof QualifiedName) {
 			return keys.equals(key) ? values : null;
+		}
 		// multiple properties may have been set
 		QualifiedName[] tmpKeys = (QualifiedName[]) this.keys;
-		for (int i = 0; i < tmpKeys.length; i++)
-			if (tmpKeys[i].equals(key))
+		for (int i = 0; i < tmpKeys.length; i++) {
+			if (tmpKeys[i].equals(key)) {
 				return ((Object[]) values)[i];
+			}
+		}
 		return null;
 	}
 
 	@Override
 	public Object getProperty(QualifiedName key) {
 		Object describedProperty = getDescribedProperty(key);
-		if (describedProperty != null)
+		if (describedProperty != null) {
 			return describedProperty;
+		}
 		return contentTypeInfo.getDefaultProperty(key);
 	}
 
 	@Override
 	public boolean isRequested(QualifiedName propertyKey) {
 		// all options requested
-		if ((flags & FLAG_ALL_OPTIONS) != 0)
+		if ((flags & FLAG_ALL_OPTIONS) != 0) {
 			return true;
+		}
 		// no options requested
-		if (keys == null)
+		if (keys == null) {
 			return false;
+		}
 		// a single option requested
-		if (keys instanceof QualifiedName)
+		if (keys instanceof QualifiedName) {
 			return keys.equals(propertyKey);
+		}
 		// some (but not all) options requested
 		QualifiedName[] tmpKeys = (QualifiedName[]) this.keys;
-		for (QualifiedName tmpKey : tmpKeys)
-			if (tmpKey.equals(propertyKey))
+		for (QualifiedName tmpKey : tmpKeys) {
+			if (tmpKey.equals(propertyKey)) {
 				return true;
+			}
+		}
 		return false;
 	}
 
 	boolean isSet() {
-		if (keys == null || values == null)
+		if (keys == null || values == null) {
 			return false;
-		if (keys instanceof QualifiedName)
+		}
+		if (keys instanceof QualifiedName) {
 			return true;
+		}
 		Object[] tmpValues = (Object[]) this.values;
-		for (Object tmpValue : tmpValues)
-			if (tmpValue != null)
+		for (Object tmpValue : tmpValues) {
+			if (tmpValue != null) {
 				return true;
+			}
+		}
 		return false;
 	}
 
@@ -142,13 +159,15 @@ public void setProperty(QualifiedName newKey, Object newValue) {
 			return;
 		}
 		QualifiedName[] tmpKeys = (QualifiedName[]) this.keys;
-		for (int i = 0; i < tmpKeys.length; i++)
+		for (int i = 0; i < tmpKeys.length; i++) {
 			if (tmpKeys[i].equals(newKey)) {
 				((Object[]) values)[i] = newValue;
 				return;
 			}
-		if ((flags & FLAG_ALL_OPTIONS) == 0)
+		}
+		if ((flags & FLAG_ALL_OPTIONS) == 0) {
 			return;
+		}
 		// need to resize arrays
 		int currentSize = tmpKeys.length;
 		tmpKeys = new QualifiedName[currentSize + 1];
@@ -164,22 +183,26 @@ public void setProperty(QualifiedName newKey, Object newValue) {
 	@Override
 	public String toString() {
 		StringBuilder result = new StringBuilder("{"); //$NON-NLS-1$
-		if (keys != null)
+		if (keys != null) {
 			if (keys instanceof QualifiedName) {
-				if (values != null)
+				if (values != null) {
 					result.append(keys + "=" + values); //$NON-NLS-1$
+				}
 			} else {
 				QualifiedName[] tmpKeys = (QualifiedName[]) keys;
 				Object[] tmpValues = (Object[]) values;
 				boolean any = false;
-				for (int i = 0; i < tmpKeys.length; i++)
+				for (int i = 0; i < tmpKeys.length; i++) {
 					if (tmpValues[i] != null) {
 						result.append(tmpKeys[i] + "=" + tmpValues[i] + ","); //$NON-NLS-1$ //$NON-NLS-2$
 						any = true;
 					}
-				if (any)
+				}
+				if (any) {
 					result.deleteCharAt(result.length() - 1);
+				}
 			}
+		}
 		result.append("} : "); //$NON-NLS-1$
 		result.append(contentTypeInfo.getContentType());
 		return result.toString();