Skip to content

Commit

Permalink
fix: remove "implements Serializable" from subclasses of SubFactory (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
ashutosh1598 authored and pvojtechovsky committed Jul 5, 2018
1 parent f0b9752 commit b1e8172
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 25 deletions.
17 changes: 9 additions & 8 deletions src/main/java/spoon/reflect/factory/ModuleFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@
*/
package spoon.reflect.factory;


import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import spoon.reflect.CtModelImpl;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtModule;
import spoon.reflect.declaration.CtModuleRequirement;
import spoon.reflect.declaration.CtNamedElement;
import spoon.reflect.declaration.CtPackageExport;
import spoon.reflect.declaration.CtProvidedService;
import spoon.reflect.declaration.CtNamedElement;
import spoon.reflect.declaration.CtUsedService;
import spoon.reflect.declaration.ParentNotInitializedException;
import spoon.reflect.reference.CtModuleReference;
import spoon.reflect.declaration.CtModuleRequirement;
import spoon.reflect.reference.CtPackageReference;
import spoon.reflect.reference.CtTypeReference;
import spoon.reflect.visitor.CtVisitor;
import spoon.support.reflect.declaration.CtElementImpl;
import spoon.support.reflect.declaration.CtModuleImpl;

import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;

public class ModuleFactory extends SubFactory implements Serializable {
public class ModuleFactory extends SubFactory {

public static class CtUnnamedModule extends CtModuleImpl {
final Set<CtModule> allModules = new HashSet<>();
Expand Down Expand Up @@ -162,3 +162,4 @@ public CtUsedService createUsedService(CtTypeReference typeReference) {
return factory.Core().createUsedService().setServiceType(typeReference);
}
}

13 changes: 7 additions & 6 deletions src/main/java/spoon/reflect/factory/PackageFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
*/
package spoon.reflect.factory;

import spoon.reflect.declaration.CtModule;
import spoon.reflect.declaration.CtPackage;
import spoon.reflect.declaration.CtType;
import spoon.reflect.reference.CtPackageReference;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.StringTokenizer;
import spoon.reflect.declaration.CtModule;
import spoon.reflect.declaration.CtPackage;
import spoon.reflect.declaration.CtType;
import spoon.reflect.reference.CtPackageReference;


/**
* The {@link CtPackage} sub-factory.
*/
public class PackageFactory extends SubFactory implements Serializable {
public class PackageFactory extends SubFactory {
private static final long serialVersionUID = 1L;

/**
Expand Down Expand Up @@ -187,3 +187,4 @@ private List<CtPackage> getSubPackageList(CtPackage pack) {
}

}

2 changes: 2 additions & 0 deletions src/main/java/spoon/reflect/factory/SubFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package spoon.reflect.factory;


/**
* This class is the superclass for all the sub-factories of
* {@link spoon.reflect.factory.Factory}.
Expand Down Expand Up @@ -53,3 +54,4 @@ public SubFactory(Factory factory) {
// }

}

24 changes: 13 additions & 11 deletions src/main/java/spoon/support/DefaultCoreFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package spoon.support;


import java.lang.annotation.Annotation;
import spoon.reflect.code.CtAnnotationFieldAccess;
import spoon.reflect.code.CtArrayRead;
import spoon.reflect.code.CtArrayWrite;
Expand Down Expand Up @@ -79,13 +81,15 @@
import spoon.reflect.declaration.CtEnum;
import spoon.reflect.declaration.CtEnumValue;
import spoon.reflect.declaration.CtField;
import spoon.reflect.declaration.CtImport;
import spoon.reflect.declaration.CtInterface;
import spoon.reflect.declaration.CtMethod;
import spoon.reflect.declaration.CtModule;
import spoon.reflect.declaration.CtPackageExport;
import spoon.reflect.declaration.CtProvidedService;
import spoon.reflect.declaration.CtModuleRequirement;
import spoon.reflect.declaration.CtPackage;
import spoon.reflect.declaration.CtPackageExport;
import spoon.reflect.declaration.CtParameter;
import spoon.reflect.declaration.CtProvidedService;
import spoon.reflect.declaration.CtTypeParameter;
import spoon.reflect.declaration.CtUsedService;
import spoon.reflect.factory.CoreFactory;
Expand All @@ -95,11 +99,9 @@
import spoon.reflect.reference.CtCatchVariableReference;
import spoon.reflect.reference.CtExecutableReference;
import spoon.reflect.reference.CtFieldReference;
import spoon.reflect.declaration.CtImport;
import spoon.reflect.reference.CtIntersectionTypeReference;
import spoon.reflect.reference.CtLocalVariableReference;
import spoon.reflect.reference.CtModuleReference;
import spoon.reflect.declaration.CtModuleRequirement;
import spoon.reflect.reference.CtPackageReference;
import spoon.reflect.reference.CtParameterReference;
import spoon.reflect.reference.CtTypeParameterReference;
Expand Down Expand Up @@ -167,25 +169,25 @@
import spoon.support.reflect.declaration.CtEnumImpl;
import spoon.support.reflect.declaration.CtEnumValueImpl;
import spoon.support.reflect.declaration.CtFieldImpl;
import spoon.support.reflect.declaration.CtImportImpl;
import spoon.support.reflect.declaration.CtInterfaceImpl;
import spoon.support.reflect.declaration.CtMethodImpl;
import spoon.support.reflect.declaration.CtPackageExportImpl;
import spoon.support.reflect.declaration.CtModuleImpl;
import spoon.support.reflect.declaration.CtProvidedServiceImpl;
import spoon.support.reflect.declaration.CtModuleRequirementImpl;
import spoon.support.reflect.declaration.CtPackageExportImpl;
import spoon.support.reflect.declaration.CtPackageImpl;
import spoon.support.reflect.declaration.CtParameterImpl;
import spoon.support.reflect.declaration.CtProvidedServiceImpl;
import spoon.support.reflect.declaration.CtTypeParameterImpl;
import spoon.support.reflect.declaration.CtUsedServiceImpl;
import spoon.support.reflect.declaration.InvisibleArrayConstructorImpl;
import spoon.support.reflect.reference.CtArrayTypeReferenceImpl;
import spoon.support.reflect.reference.CtCatchVariableReferenceImpl;
import spoon.support.reflect.reference.CtExecutableReferenceImpl;
import spoon.support.reflect.reference.CtFieldReferenceImpl;
import spoon.support.reflect.declaration.CtImportImpl;
import spoon.support.reflect.reference.CtIntersectionTypeReferenceImpl;
import spoon.support.reflect.reference.CtLocalVariableReferenceImpl;
import spoon.support.reflect.reference.CtModuleReferenceImpl;
import spoon.support.reflect.declaration.CtModuleRequirementImpl;
import spoon.support.reflect.reference.CtPackageReferenceImpl;
import spoon.support.reflect.reference.CtParameterReferenceImpl;
import spoon.support.reflect.reference.CtTypeParameterReferenceImpl;
Expand All @@ -195,14 +197,13 @@
import spoon.support.reflect.reference.CtWildcardStaticTypeMemberReferenceImpl;
import spoon.support.visitor.equals.CloneHelper;

import java.io.Serializable;
import java.lang.annotation.Annotation;


/**
* This class implements a default core factory for Spoon's meta-model. This
* implementation is done with regular Java classes (POJOs).
*/
public class DefaultCoreFactory extends SubFactory implements CoreFactory, Serializable {
public class DefaultCoreFactory extends SubFactory implements CoreFactory {

private static final long serialVersionUID = 1L;

Expand Down Expand Up @@ -1030,3 +1031,4 @@ public CtUsedService createUsedService() {
}

}

0 comments on commit b1e8172

Please sign in to comment.