PatchesAndForks/rome
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Formatted and cleaned up the surcecode

Browse source
This commit is contained in:
Patrick Gotthard 2013-10-07 18:36:05 +02:00
parent d5fe56101f
commit 6cc4636ffc
15 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/sun/syndication/feed/atom/Person.java
View file

@ -115,6 +115,7 @@ public class Person implements SyndPerson, Cloneable, Serializable, Extendable {
* @return the person name, <b>null</b> if none.
*
*/
@Override
public String getName() {
return name;
}
@ -126,6 +127,7 @@ public class Person implements SyndPerson, Cloneable, Serializable, Extendable {
* @param name the person name, <b>null</b> if none.
*
*/
@Override
public void setName(final String name) {
this.name = name;
}
@ -169,6 +171,7 @@ public class Person implements SyndPerson, Cloneable, Serializable, Extendable {
* @return the person email, <b>null</b> if none.
*
*/
@Override
public String getEmail() {
return email;
}
@ -180,6 +183,7 @@ public class Person implements SyndPerson, Cloneable, Serializable, Extendable {
* @param email the person email, <b>null</b> if none.
*
*/
@Override
public void setEmail(final String email) {
this.email = email;
}
@ -191,6 +195,7 @@ public class Person implements SyndPerson, Cloneable, Serializable, Extendable {
* @return Returns the uri.
* @since Atom 1.0
*/
@Override
public String getUri() {
return uri;
}
@ -202,6 +207,7 @@ public class Person implements SyndPerson, Cloneable, Serializable, Extendable {
* @param uri The uri to set.
* @since Atom 1.0
*/
@Override
public void setUri(final String uri) {
this.uri = uri;
}

13
src/main/java/com/sun/syndication/feed/impl/BeanIntrospector.java
View file

@ -94,14 +94,15 @@ public class BeanIntrospector {
return pds;
}
private static List<PropertyDescriptor> merge(final Map<String, PropertyDescriptor> getters, final Map<String, PropertyDescriptor> setters) throws IntrospectionException {
private static List<PropertyDescriptor> merge(final Map<String, PropertyDescriptor> getters, final Map<String, PropertyDescriptor> setters)
throws IntrospectionException {
final List<PropertyDescriptor> props = new ArrayList<PropertyDescriptor>();
final Set<String> processedProps = new HashSet<String>();
final Iterator<String> gs = getters.keySet().iterator();
while (gs.hasNext()) {
final String name = (String) gs.next();
final PropertyDescriptor getter = (PropertyDescriptor) getters.get(name);
final PropertyDescriptor setter = (PropertyDescriptor) setters.get(name);
final String name = gs.next();
final PropertyDescriptor getter = getters.get(name);
final PropertyDescriptor setter = setters.get(name);
if (setter != null) {
processedProps.add(name);
final PropertyDescriptor prop = new PropertyDescriptor(name, getter.getReadMethod(), setter.getWriteMethod());
@ -114,8 +115,8 @@ public class BeanIntrospector {
writeOnlyProps.removeAll(processedProps);
final Iterator<String> ss = writeOnlyProps.iterator();
while (ss.hasNext()) {
final String name = (String) ss.next();
final PropertyDescriptor setter = (PropertyDescriptor) setters.get(name);
final String name = ss.next();
final PropertyDescriptor setter = setters.get(name);
props.add(setter);
}
return props;

8
src/main/java/com/sun/syndication/feed/impl/CloneableBean.java
View file

@ -107,7 +107,7 @@ public class CloneableBean implements Serializable, Cloneable {
public CloneableBean(final Object obj, final Set<String> ignoreProperties) {
this.obj = obj;
if (ignoreProperties == null) {
this.ignoreProperties = Collections.<String>emptySet();
this.ignoreProperties = Collections.<String> emptySet();
} else {
this.ignoreProperties = ignoreProperties;
}
@ -236,7 +236,7 @@ public class CloneableBean implements Serializable, Cloneable {
private <T> Collection<T> cloneCollection(final Collection<T> collection) throws Exception {
@SuppressWarnings("unchecked")
final Class<Collection<T>> mClass = (Class<Collection<T>>) collection.getClass();
final Collection<T> newColl = (Collection<T>) mClass.newInstance();
final Collection<T> newColl = mClass.newInstance();
final Iterator<T> i = collection.iterator();
while (i.hasNext()) {
newColl.add(doClone(i.next()));
@ -247,10 +247,10 @@ public class CloneableBean implements Serializable, Cloneable {
private <S, T> Map<S, T> cloneMap(final Map<S, T> map) throws Exception {
@SuppressWarnings("unchecked")
final Class<Map<S, T>> mClass = (Class<Map<S, T>>) map.getClass();
final Map<S, T> newMap = (Map<S, T>) mClass.newInstance();
final Map<S, T> newMap = mClass.newInstance();
final Iterator<Entry<S, T>> entries = map.entrySet().iterator();
while (entries.hasNext()) {
final Map.Entry<S, T> entry = (Map.Entry<S, T>) entries.next();
final Map.Entry<S, T> entry = entries.next();
newMap.put(doClone(entry.getKey()), doClone(entry.getValue()));
}
return newMap;

11
src/main/java/com/sun/syndication/feed/impl/CopyFromHelper.java
View file

@ -41,7 +41,8 @@ public class CopyFromHelper {
private final Map<String, Class<?>> baseInterfaceMap; // ENTRIES(propertyName,interface.class)
private final Map<Class<? extends CopyFrom<?>>, Class<?>> baseImplMap; // ENTRIES(interface.class,implementation.class)
public CopyFromHelper(final Class<? extends CopyFrom<?>> beanInterfaceClass, final Map<String, Class<?>> basePropInterfaceMap, final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap) {
public CopyFromHelper(final Class<? extends CopyFrom<?>> beanInterfaceClass, final Map<String, Class<?>> basePropInterfaceMap,
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap) {
this.beanInterfaceClass = beanInterfaceClass;
baseInterfaceMap = basePropInterfaceMap;
baseImplMap = basePropClassImplMap;
@ -104,11 +105,11 @@ public class CopyFromHelper {
if (value != null) {
final Class<?> vClass = value.getClass();
if (vClass.isArray()) {
value = (T) this.<Object>doCopyArray((Object[]) value, baseInterface);
value = (T) this.<Object> doCopyArray((Object[]) value, baseInterface);
} else if (value instanceof Collection) {
value = (T) this.<Object>doCopyCollection((Collection<Object>) value, baseInterface);
value = (T) this.<Object> doCopyCollection((Collection<Object>) value, baseInterface);
} else if (value instanceof Map) {
value = (T) this.<Object, Object>doCopyMap((Map<Object, Object>) value, baseInterface);
value = (T) this.<Object, Object> doCopyMap((Map<Object, Object>) value, baseInterface);
} else if (isBasicType(vClass)) {
// value = value; // nothing to do here
if (value instanceof Date) { // because Date it is not inmutable
@ -153,7 +154,7 @@ public class CopyFromHelper {
}
final Iterator<T> i = collection.iterator();
while (i.hasNext()) {
newColl.add(this.<T>doCopy(i.next(), baseInterface));
newColl.add(this.<T> doCopy(i.next(), baseInterface));
}
return newColl;
}

2
src/main/java/com/sun/syndication/feed/module/DCSubjectImpl.java
View file

@ -172,7 +172,7 @@ public class DCSubjectImpl implements Cloneable, Serializable, DCSubject {
basePropInterfaceMap.put("taxonomyUri", String.class);
basePropInterfaceMap.put("value", String.class);
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>>emptyMap();
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>> emptyMap();
COPY_FROM_HELPER = new CopyFromHelper(DCSubject.class, basePropInterfaceMap, basePropClassImplMap);
}

2
src/main/java/com/sun/syndication/feed/module/SyModuleImpl.java
View file

@ -157,7 +157,7 @@ public class SyModuleImpl extends ModuleImpl implements SyModule {
basePropInterfaceMap.put("updateFrequency", Integer.TYPE);
basePropInterfaceMap.put("updateBase", Date.class);
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>>emptyMap();
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>> emptyMap();
COPY_FROM_HELPER = new CopyFromHelper(SyModule.class, basePropInterfaceMap, basePropClassImplMap);
}

2
src/main/java/com/sun/syndication/feed/synd/SyndContentImpl.java
View file

@ -195,7 +195,7 @@ public class SyndContentImpl implements Serializable, SyndContent {
basePropInterfaceMap.put("type", String.class);
basePropInterfaceMap.put("value", String.class);
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>>emptyMap();
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>> emptyMap();
COPY_FROM_HELPER = new CopyFromHelper(SyndContent.class, basePropInterfaceMap, basePropClassImplMap);
}

2
src/main/java/com/sun/syndication/feed/synd/SyndEnclosureImpl.java
View file

@ -166,7 +166,7 @@ public class SyndEnclosureImpl implements Serializable, SyndEnclosure {
basePropInterfaceMap.put("type", String.class);
basePropInterfaceMap.put("length", Long.TYPE);
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>>emptyMap();
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>> emptyMap();
COPY_FROM_HELPER = new CopyFromHelper(SyndEnclosure.class, basePropInterfaceMap, basePropClassImplMap);
}

2
src/main/java/com/sun/syndication/feed/synd/SyndImageImpl.java
View file

@ -218,7 +218,7 @@ public class SyndImageImpl implements Serializable, SyndImage {
basePropInterfaceMap.put("link", String.class);
basePropInterfaceMap.put("description", String.class);
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>>emptyMap();
final Map<Class<? extends CopyFrom<?>>, Class<?>> basePropClassImplMap = Collections.<Class<? extends CopyFrom<?>>, Class<?>> emptyMap();
COPY_FROM_HELPER = new CopyFromHelper(SyndImage.class, basePropInterfaceMap, basePropClassImplMap);
}

2
src/main/java/com/sun/syndication/io/WireFeedOutput.java
View file

@ -50,7 +50,7 @@ public class WireFeedOutput {
private static FeedGenerators getFeedGenerators() {
synchronized (WireFeedOutput.class) {
FeedGenerators generators = (FeedGenerators) clMap.get(Thread.currentThread().getContextClassLoader());
FeedGenerators generators = clMap.get(Thread.currentThread().getContextClassLoader());
if (generators == null) {
generators = new FeedGenerators();
clMap.put(Thread.currentThread().getContextClassLoader(), generators);

6
src/main/java/com/sun/syndication/io/impl/BaseWireFeedGenerator.java
View file

@ -88,7 +88,7 @@ public abstract class BaseWireFeedGenerator implements WireFeedGenerator {
if (foreignMarkup != null) {
final Iterator<Element> elems = foreignMarkup.iterator();
while (elems.hasNext()) {
final Element elem = (Element) elems.next();
final Element elem = elems.next();
final Parent parent = elem.getParent();
if (parent != null) {
parent.removeContent(elem);
@ -136,8 +136,8 @@ public abstract class BaseWireFeedGenerator implements WireFeedGenerator {
}
final List<Element> kids = el.getChildren();
for (int i = 0; i < kids.size(); i++) {
collectUsedPrefixes((Element) kids.get(i), collector); // recursion
// - worth it
collectUsedPrefixes(kids.get(i), collector); // recursion
// - worth it
}
}

2
src/main/java/com/sun/syndication/io/impl/FeedParsers.java
View file

@ -74,7 +74,7 @@ public class FeedParsers extends PluginManager<WireFeedParser> {
final List<WireFeedParser> parsers = getPlugins();
WireFeedParser parser = null;
for (int i = 0; parser == null && i < parsers.size(); i++) {
parser = (WireFeedParser) parsers.get(i);
parser = parsers.get(i);
if (!parser.isMyType(document)) {
parser = null;
}

2
src/main/java/com/sun/syndication/io/impl/ModuleGenerators.java
View file

@ -37,7 +37,7 @@ public class ModuleGenerators extends PluginManager<ModuleGenerator> {
}
public ModuleGenerator getGenerator(final String uri) {
return (ModuleGenerator) getPlugin(uri);
return getPlugin(uri);
}
@Override

2
src/main/java/com/sun/syndication/io/impl/PluginManager.java
View file

@ -154,7 +154,7 @@ public abstract class PluginManager<T> {
}
classes.add(mClass);
}
final Class<T>[] array = (Class<T>[]) new Class[classes.size()];
final Class<T>[] array = new Class[classes.size()];
classes.toArray(array);
return array;
}

2
src/test/java/com/sun/syndication/unittest/FeedTest.java
View file

@ -8,12 +8,12 @@ import junit.framework.TestCase;
import org.jdom2.Document;
import org.jdom2.input.SAXBuilder;
import org.jdom2.input.sax.XMLReaders;
import com.sun.syndication.feed.WireFeed;
import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.io.SyndFeedInput;
import com.sun.syndication.io.WireFeedInput;
import org.jdom2.input.sax.XMLReaders;
/**
* @author pat, tucu