diff options
author | Brian Vosburgh | 2013-03-18 19:20:19 +0000 |
---|---|---|
committer | Brian Vosburgh | 2013-03-26 15:24:15 +0000 |
commit | 7660b573a5c825dfb2607c4d7d17fbba0e808db6 (patch) | |
tree | 5ef01cae74ead2546a9b1d71b9091ee6b845e160 /jaxb | |
parent | 9dea61726e13b439a8ec627d8f4aec4487998805 (diff) | |
download | webtools.dali-7660b573a5c825dfb2607c4d7d17fbba0e808db6.tar.gz webtools.dali-7660b573a5c825dfb2607c4d7d17fbba0e808db6.tar.xz webtools.dali-7660b573a5c825dfb2607c4d7d17fbba0e808db6.zip |
clean up Transformers
Diffstat (limited to 'jaxb')
8 files changed, 78 insertions, 53 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClassMapping.java index 9815702fd8..75ff055277 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClassMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbClassMapping.java @@ -10,6 +10,7 @@ package org.eclipse.jpt.jaxb.core.context; import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; +import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.common.utility.transformer.Transformer; @@ -82,9 +83,9 @@ public interface JaxbClassMapping Transformer<JaxbClassMapping, JaxbClassMapping> SUPER_CLASS_TRANSFORMER = new SuperClassTransformer(); class SuperClassTransformer - extends AbstractTransformer<JaxbClassMapping, JaxbClassMapping> { + extends TransformerAdapter<JaxbClassMapping, JaxbClassMapping> { @Override - protected JaxbClassMapping transform_(JaxbClassMapping mapping) { + public JaxbClassMapping transform(JaxbClassMapping mapping) { return mapping.getSuperclass(); } } @@ -104,9 +105,10 @@ public interface JaxbClassMapping Transformer<JaxbClassMapping, Iterable<? extends JaxbPersistentAttribute>> ATTRIBUTES_TRANSFORMER = new AttributesTransformer(); class AttributesTransformer - extends AbstractTransformer<JaxbClassMapping, Iterable<? extends JaxbPersistentAttribute>> { + extends TransformerAdapter<JaxbClassMapping, Iterable<? extends JaxbPersistentAttribute>> + { @Override - protected Iterable<? extends JaxbPersistentAttribute> transform_(JaxbClassMapping mapping) { + public Iterable<? extends JaxbPersistentAttribute> transform(JaxbClassMapping mapping) { return mapping.getAttributes(); } } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java index e1c3a95d83..564800d20e 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java @@ -58,7 +58,6 @@ import org.eclipse.jpt.common.utility.internal.command.ThreadLocalExtendedComman import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; -import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jaxb.core.JaxbFile; import org.eclipse.jpt.jaxb.core.JaxbProject; import org.eclipse.jpt.jaxb.core.SchemaLibrary; @@ -584,16 +583,9 @@ public abstract class AbstractJaxbProject if (contentType.isKindOf(JavaResourceCompilationUnit.PACKAGE_INFO_CONTENT_TYPE)) { try { - Transformer<IPackageDeclaration, JaxbPackageInfo> transformer = new TransformerAdapter<IPackageDeclaration, JaxbPackageInfo>() { - @Override - public JaxbPackageInfo transform(IPackageDeclaration o) { - JaxbPackage jaxbPackage = getContextRoot().getPackage(o.getElementName()); - return (jaxbPackage != null) ? jaxbPackage.getPackageInfo() : null; - } - }; return IterableTools.removeNulls( IterableTools.transform( - IterableTools.iterable(cu.getPackageDeclarations()), transformer)); + IterableTools.iterable(cu.getPackageDeclarations()), new PackageDeclarationTransformer())); } catch (JavaModelException jme) { return EmptyIterable.instance(); @@ -601,15 +593,9 @@ public abstract class AbstractJaxbProject } else if (contentType.isKindOf(JavaResourceCompilationUnit.CONTENT_TYPE)) { try { - Transformer<IType, JavaType> transformer = new TransformerAdapter<IType, JavaType>() { - @Override - public JavaType transform(IType o) { - return getContextRoot().getJavaType(o.getFullyQualifiedName('.')); - } - }; return IterableTools.removeNulls( IterableTools.transform( - IterableTools.iterable(cu.getAllTypes()), transformer)); + IterableTools.iterable(cu.getAllTypes()), new TypeTransformer())); } catch (JavaModelException jme) { return EmptyIterable.instance(); @@ -618,7 +604,26 @@ public abstract class AbstractJaxbProject return EmptyIterable.instance(); } - + + class PackageDeclarationTransformer + extends TransformerAdapter<IPackageDeclaration, JaxbPackageInfo> + { + @Override + public JaxbPackageInfo transform(IPackageDeclaration o) { + JaxbPackage jaxbPackage = getContextRoot().getPackage(o.getElementName()); + return (jaxbPackage != null) ? jaxbPackage.getPackageInfo() : null; + } + } + + class TypeTransformer + extends TransformerAdapter<IType, JavaType> + { + @Override + public JavaType transform(IType o) { + return getContextRoot().getJavaType(o.getFullyQualifiedName('.')); + } + } + private IFile getCorrespondingResource(ICompilationUnit cu) { try { return (IFile) cu.getCorrespondingResource(); @@ -693,13 +698,16 @@ public abstract class AbstractJaxbProject // ********** Java resource package look-up ********** public Iterable<JavaResourcePackage> getJavaResourcePackages() { - Transformer<JaxbFile, JavaResourcePackage> transformer = new TransformerAdapter<JaxbFile, JavaResourcePackage>() { - @Override - public JavaResourcePackage transform(JaxbFile jaxbFile) { - return ((JavaResourcePackageInfoCompilationUnit) jaxbFile.getResourceModel()).getPackage(); - } - }; - return IterableTools.removeNulls(IterableTools.transform(this.getPackageInfoSourceJaxbFiles(), transformer)); + return IterableTools.removeNulls(IterableTools.transform(this.getPackageInfoSourceJaxbFiles(), new JaxbFileTransformer())); + } + + static class JaxbFileTransformer + extends TransformerAdapter<JaxbFile, JavaResourcePackage> + { + @Override + public JavaResourcePackage transform(JaxbFile jaxbFile) { + return ((JavaResourcePackageInfoCompilationUnit) jaxbFile.getResourceModel()).getPackage(); + } } public JavaResourcePackage getJavaResourcePackage(String packageName) { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java index 1fd28f19c9..27f290b12f 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextRoot.java @@ -27,7 +27,6 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.predicate.Predicate; -import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jaxb.core.JaxbProject; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; @@ -243,8 +242,9 @@ public abstract class AbstractJaxbContextRoot } protected class JavaResourceTypeNameTransformer - implements Transformer<JavaResourceAbstractType, String> { - + extends TransformerAdapter<JavaResourceAbstractType, String> + { + @Override public String transform(JavaResourceAbstractType input) { return input.getTypeBinding().getQualifiedName(); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java index de53468522..2a054c705f 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaClassMapping.java @@ -612,9 +612,12 @@ public class GenericJavaClassMapping * return those inherited attributes that are not included */ protected Iterable<JaxbPersistentAttribute> getOtherInheritedAttributes() { - return IterableTools.children( - ObjectTools.chain(getSuperclass(), JaxbClassMapping.SUPER_CLASS_TRANSFORMER), - JaxbClassMapping.ATTRIBUTES_TRANSFORMER); + return (this.superclass == null) ? + IterableTools.<JaxbPersistentAttribute>emptyIterable() : + IterableTools.children( + ObjectTools.chain(this.superclass, JaxbClassMapping.SUPER_CLASS_TRANSFORMER), + JaxbClassMapping.ATTRIBUTES_TRANSFORMER + ); } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/jaxbindex/JaxbIndexResourceImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/jaxbindex/JaxbIndexResourceImpl.java index 445c7602c0..69c18470ef 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/jaxbindex/JaxbIndexResourceImpl.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/resource/jaxbindex/JaxbIndexResourceImpl.java @@ -18,7 +18,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; -import org.eclipse.jpt.common.utility.transformer.Transformer; +import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.jaxb.core.internal.resource.AbstractJaxbFileResourceModel; import org.eclipse.jpt.jaxb.core.resource.jaxbindex.JaxbIndexResource; @@ -72,13 +72,14 @@ public class JaxbIndexResourceImpl } protected class PrefixTransformer - implements Transformer<String, String> + extends TransformerAdapter<String, String> { protected final String prefix; protected PrefixTransformer(String prefix) { super(); this.prefix = prefix; } + @Override public String transform(String string) { return this.prefix + string; } diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/platform/JaxbPlatformConfig.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/platform/JaxbPlatformConfig.java index d284a3cc80..16e2968528 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/platform/JaxbPlatformConfig.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/platform/JaxbPlatformConfig.java @@ -10,7 +10,9 @@ package org.eclipse.jpt.jaxb.core.platform; import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter; +import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.predicate.Predicate; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; /** @@ -48,6 +50,16 @@ public interface JaxbPlatformConfig { */ String getLabel(); + Transformer<JaxbPlatformConfig, String> LABEL_TRANSFORMER = new LabelTransformer(); + static class LabelTransformer + extends TransformerAdapter<JaxbPlatformConfig, String> + { + @Override + public String transform(JaxbPlatformConfig config) { + return config.getLabel(); + } + } + /** * Return the config's extension-supplied factory class name. * The class must be instantiable and implement the diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java index a10bcc4914..e20ed3f4cd 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java @@ -523,12 +523,7 @@ public class XPath { final String prefix, int pos) { if (getTextRange(context).includes(pos) || getNextStep() == null) { - Transformer<String, String> transformer = new TransformerAdapter<String, String>() { - @Override - public String transform(String s) { - return StringTools.concatenate(prefix, s); - } - }; + Transformer<String, String> transformer = new StringPrefixer(prefix); return IterableTools.transform( IterableTools.transform( IterableTools.concatenate( @@ -581,6 +576,20 @@ public class XPath { } } + static class StringPrefixer + extends TransformerAdapter<String, String> + { + private final String prefix; + StringPrefixer(String prefix) { + super(); + this.prefix = prefix; + } + @Override + public String transform(String s) { + return StringTools.concatenate(this.prefix, s); + } + } + protected class TextStep extends Step { diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbProjectPropertiesPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbProjectPropertiesPage.java index 2c1c88d8b2..f3ee04029c 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbProjectPropertiesPage.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbProjectPropertiesPage.java @@ -27,14 +27,12 @@ import org.eclipse.jpt.common.utility.internal.model.value.PropertyCollectionVal import org.eclipse.jpt.common.utility.internal.model.value.SetCollectionValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.StaticCollectionValueModel; -import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.model.Model; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; import org.eclipse.jpt.common.utility.model.value.CollectionValueModel; import org.eclipse.jpt.common.utility.model.value.ListValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jaxb.core.JaxbPreferences; import org.eclipse.jpt.jaxb.core.JaxbProject; import org.eclipse.jpt.jaxb.core.JaxbProjectManager; @@ -196,7 +194,7 @@ public class JaxbProjectPropertiesPage buildPlatformChoicesModel(), this.platformModel, platformDropDown, - JAXB_PLATFORM_CONFIG_LABEL_CONVERTER); + JaxbPlatformConfig.LABEL_TRANSFORMER); buildFacetsPageLink(group, JptJaxbUiMessages.JAXB_FACET_WIZARD_PAGE_FACETS_PAGE_LINK); } @@ -241,14 +239,6 @@ public class JaxbProjectPropertiesPage } }; - private static final Transformer<JaxbPlatformConfig, String> JAXB_PLATFORM_CONFIG_LABEL_CONVERTER = - new TransformerAdapter<JaxbPlatformConfig, String>() { - @Override - public String transform(JaxbPlatformConfig desc) { - return desc.getLabel(); - } - }; - // ********** OK/Revert/Apply behavior ********** |