From 546a5d73709f8ccd19557bcdd52ffce4394c125b Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Wed, 5 Nov 2014 12:25:22 +0100 Subject: [PATCH] #52: unnecessary copyright comments removed --- cobigen/cobigen-javaplugin/pom.xml | 3 --- .../javaplugin/JavaPluginActivator.java | 5 +---- .../javaplugin/JavaTriggerInterpreter.java | 3 --- .../inputreader/JavaInputReader.java | 3 --- .../inputreader/ParsedJavaModelBuilder.java | 3 --- .../ReflectedJavaModelBuilder.java | 3 --- .../inputreader/to/PackageFolder.java | 3 --- .../javaplugin/matcher/JavaMatcher.java | 3 --- .../cobigen/javaplugin/merger/JavaMerger.java | 3 --- .../CustomModelWriterFactory.java | 3 --- .../libextension/ExtendedJavaParameter.java | 3 --- .../ModifyableClassLibraryBuilder.java | 3 --- .../libextension/ModifyableSourceLibrary.java | 19 ++++++++----------- .../resover/TriggerExpressionResolver.java | 9 +++------ .../test/merger/JavaMergerTest.java | 3 --- .../libextension/CustomModelWriterTest.java | 3 --- .../TriggerExpressionResolverTest.java | 5 +---- .../merger/BaseFile_encoding_ISO-8859-1.java | 3 --- .../test/merger/BaseFile_encoding_UTF-8.java | 7 ++----- .../test/merger/BaseFile_field.java | 5 +---- .../test/merger/BaseFile_generics.java | 5 +---- .../test/merger/BaseFile_import.java | 5 +---- .../test/merger/BaseFile_innerClass.java | 17 +++++++---------- .../test/merger/BaseFile_method.java | 11 ++++------- .../test/merger/PatchFile_encoding.java | 5 +---- .../test/merger/PatchFile_field.java | 5 +---- .../test/merger/PatchFile_generics.java | 7 ++----- .../test/merger/PatchFile_import.java | 5 +---- .../test/merger/PatchFile_innerClass.java | 17 +++++++---------- .../test/merger/PatchFile_method.java | 13 +++++-------- .../merger/libextension/ClassFile_field.java | 5 +---- .../libextension/ClassFile_generics.java | 5 +---- .../merger/libextension/ClassFile_header.java | 3 --- .../libextension/ClassFile_modifiers.java | 13 +++++-------- 34 files changed, 53 insertions(+), 155 deletions(-) diff --git a/cobigen/cobigen-javaplugin/pom.xml b/cobigen/cobigen-javaplugin/pom.xml index 0a51418a44..5d354e0b9c 100644 --- a/cobigen/cobigen-javaplugin/pom.xml +++ b/cobigen/cobigen-javaplugin/pom.xml @@ -1,7 +1,4 @@ - 4.0.0 diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/JavaPluginActivator.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/JavaPluginActivator.java index 660f0af4a7..2e5266d191 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/JavaPluginActivator.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/JavaPluginActivator.java @@ -1,6 +1,3 @@ -/* - * Copyright © Capgemini 2013. All rights reserved. - */ package com.capgemini.cobigen.javaplugin; import java.util.List; @@ -12,7 +9,7 @@ import com.google.common.collect.Lists; /** - * + * * @author mbrunnli (06.04.2014) */ public class JavaPluginActivator implements IGeneratorPluginActivator { diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/JavaTriggerInterpreter.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/JavaTriggerInterpreter.java index 25f903ab47..c438cb99cb 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/JavaTriggerInterpreter.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/JavaTriggerInterpreter.java @@ -1,6 +1,3 @@ -/* - * Copyright © Capgemini 2013. All rights reserved. - */ package com.capgemini.cobigen.javaplugin; import com.capgemini.cobigen.extension.IInputReader; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/JavaInputReader.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/JavaInputReader.java index 20c47c4867..7ca7ace4a4 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/JavaInputReader.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/JavaInputReader.java @@ -1,6 +1,3 @@ -/* - * Copyright © Capgemini 2013. All rights reserved. - */ package com.capgemini.cobigen.javaplugin.inputreader; import java.io.File; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ParsedJavaModelBuilder.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ParsedJavaModelBuilder.java index 415cb44eb4..b2e89a729f 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ParsedJavaModelBuilder.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ParsedJavaModelBuilder.java @@ -1,6 +1,3 @@ -/* - * Copyright © Capgemini 2013. All rights reserved. - */ package com.capgemini.cobigen.javaplugin.inputreader; import java.util.Arrays; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java index ce19e15c0f..3ce78fb786 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/ReflectedJavaModelBuilder.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini.cobigen.javaplugin.inputreader; import java.lang.annotation.Annotation; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/to/PackageFolder.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/to/PackageFolder.java index c5320ddf12..edb72991b1 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/to/PackageFolder.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/inputreader/to/PackageFolder.java @@ -1,6 +1,3 @@ -/* - * Copyright © Capgemini 2013. All rights reserved. - */ package com.capgemini.cobigen.javaplugin.inputreader.to; import java.net.URI; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/matcher/JavaMatcher.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/matcher/JavaMatcher.java index ca573fa3aa..0f28f3a45e 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/matcher/JavaMatcher.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/matcher/JavaMatcher.java @@ -1,6 +1,3 @@ -/* - * Copyright © Capgemini 2013. All rights reserved. - */ package com.capgemini.cobigen.javaplugin.matcher; import java.util.HashMap; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/JavaMerger.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/JavaMerger.java index e73040bd3a..0a9830cac4 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/JavaMerger.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/JavaMerger.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini.cobigen.javaplugin.merger; import java.io.File; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/CustomModelWriterFactory.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/CustomModelWriterFactory.java index 37f7e772e0..f5b8ff7c2e 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/CustomModelWriterFactory.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/CustomModelWriterFactory.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini.cobigen.javaplugin.merger.libextension; import com.thoughtworks.qdox.writer.ModelWriter; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ExtendedJavaParameter.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ExtendedJavaParameter.java index 693a4582a2..28831a56ed 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ExtendedJavaParameter.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ExtendedJavaParameter.java @@ -1,6 +1,3 @@ -/* - * Copyright © Capgemini 2013. All rights reserved. - */ package com.capgemini.cobigen.javaplugin.merger.libextension; import java.util.LinkedList; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableClassLibraryBuilder.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableClassLibraryBuilder.java index 0b1cff466d..5fa8c9937a 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableClassLibraryBuilder.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableClassLibraryBuilder.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini.cobigen.javaplugin.merger.libextension; import java.io.File; diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableSourceLibrary.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableSourceLibrary.java index 1cddf184b1..ebdb853757 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableSourceLibrary.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/merger/libextension/ModifyableSourceLibrary.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini.cobigen.javaplugin.merger.libextension; import java.io.File; @@ -34,7 +31,7 @@ * {@link SourceLibrary} parsing inputs into the {@link JavaSource} representation by using a * {@link ModifyableModelBuilder} in order to get the internal representation of {@link JavaClass}es as * {@link ModifyableJavaClass} es - * + * * @author mbrunnli (04.04.2013) */ public class ModifyableSourceLibrary extends SourceLibrary { @@ -51,7 +48,7 @@ public class ModifyableSourceLibrary extends SourceLibrary { /** * Creates a new {@link ModifyableJavaClass} - * + * * @param parent * {@link ClassLibrary} * @author mbrunnli (04.04.2013) @@ -62,7 +59,7 @@ public ModifyableSourceLibrary(AbstractClassLibrary parent) { /** * Adds a source to the source repository and returns it representative {@link JavaSource} - * + * * @param source * to be parsed * @return the created {@link JavaSource} @@ -82,7 +79,7 @@ public JavaSource addSource(Object source) throws ParseException, IOException { /** * Parses the given source using the given {@link ModelBuilder} - * + * * @param modelBuilder * {@link ModelBuilder} to be used to build the {@link JavaSource} * @param source @@ -122,7 +119,7 @@ private JavaSource parseSource(Builder modelBuilder, Object source) throws FileN /** * Parses the given stream contents and closes the stream if any exception occurs - * + * * @param stream * to be parsed * @param url @@ -148,7 +145,7 @@ protected JavaSource parse(InputStream stream, URL url, Builder modelBuilder) th /** * Parses the given reader contents and closes the reader if any exception occurs - * + * * @param reader * to be parsed * @param url @@ -174,7 +171,7 @@ protected JavaSource parse(Reader reader, URL url, Builder modelBuilder) throws /** * Parses the given reader contents and closes the reader if any exception occurs - * + * * @param lexer * to be parsed * @param url @@ -214,7 +211,7 @@ private JavaSource parse(JavaLexer lexer, URL url, Builder builder) throws Parse /** * {@inheritDoc} - * + * * @author mbrunnli (04.04.2013) */ @Override diff --git a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/resover/TriggerExpressionResolver.java b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/resover/TriggerExpressionResolver.java index b53f83c9ed..456b495d89 100644 --- a/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/resover/TriggerExpressionResolver.java +++ b/cobigen/cobigen-javaplugin/src/main/java/com/capgemini/cobigen/javaplugin/resover/TriggerExpressionResolver.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini.cobigen.javaplugin.resover; import java.util.regex.Matcher; @@ -14,7 +11,7 @@ /** * The {@link TriggerExpressionResolver} resolves expressions for {@link Trigger} objects. - * + * * @author mbrunnli (05.04.2013) */ public class TriggerExpressionResolver { @@ -36,7 +33,7 @@ public class TriggerExpressionResolver { /** * Creates a new {@link TriggerExpressionResolver} for the given pojo with its {@link ClassLoader} - * + * * @param pojo * current triggered POJO {@link Class} * @author mbrunnli (15.04.2013) @@ -47,7 +44,7 @@ public TriggerExpressionResolver(Class pojo) { /** * Evaluates the given expression - * + * * @param expression * to be evaluated * @return true if the expression is valid,
diff --git a/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/merger/JavaMergerTest.java b/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/merger/JavaMergerTest.java index f15f973139..da24bd2fda 100644 --- a/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/merger/JavaMergerTest.java +++ b/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/merger/JavaMergerTest.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini.cobigen.javaplugin.test.merger; import static com.capgemini.cobigen.javaplugin.util.JavaParserUtil.getFirstJavaClass; diff --git a/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/merger/libextension/CustomModelWriterTest.java b/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/merger/libextension/CustomModelWriterTest.java index c7600e357f..6351da08dd 100644 --- a/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/merger/libextension/CustomModelWriterTest.java +++ b/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/merger/libextension/CustomModelWriterTest.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini.cobigen.javaplugin.test.merger.libextension; import java.io.File; diff --git a/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/resolver/TriggerExpressionResolverTest.java b/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/resolver/TriggerExpressionResolverTest.java index 07692a5631..46a5543569 100644 --- a/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/resolver/TriggerExpressionResolverTest.java +++ b/cobigen/cobigen-javaplugin/src/test/java/com/capgemini/cobigen/javaplugin/test/resolver/TriggerExpressionResolverTest.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini.cobigen.javaplugin.test.resolver; import org.junit.Assert; @@ -11,7 +8,7 @@ /** * The class TriggerExpressionResolverTest contains tests for the class * {@link TriggerExpressionResolver} - * + * * @author mbrunnli (05.04.2013) */ public class TriggerExpressionResolverTest { diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_encoding_ISO-8859-1.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_encoding_ISO-8859-1.java index ec6bbc850c..7d5956a6cf 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_encoding_ISO-8859-1.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_encoding_ISO-8859-1.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; /** diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_encoding_UTF-8.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_encoding_UTF-8.java index 25d0cf9d14..110fc0ed13 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_encoding_UTF-8.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_encoding_UTF-8.java @@ -1,14 +1,11 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; /** * JavaDoc enthält Ä - * + * * @author mbrunnli (15.04.2013) */ public class FooBar { - + } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_field.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_field.java index bd1f5f5cff..cbbb4d093e 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_field.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_field.java @@ -1,10 +1,7 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public class FooBar { - + private int baseField = 0; private int baseFieldUndefined; diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_generics.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_generics.java index 56b4932267..31c901930b 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_generics.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_generics.java @@ -1,10 +1,7 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public abstract class Clazz extends Map { - + private T t; public void set(T t) { diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_import.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_import.java index 97114fe6df..354e75bda0 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_import.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_import.java @@ -1,11 +1,8 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; import com.capgemini.BaseClassImport; public class FooBar { - + } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_innerClass.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_innerClass.java index e0375a003d..3831cc87dd 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_innerClass.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_innerClass.java @@ -1,27 +1,24 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public class FooBar { - + enum BaseEnum { BASE_VALUE } - + private class InnerBaseClass { - + private int innerBaseField = 0; - + enum InnerBaseEnum { INNER_BASE_VALUE } - + void innerBaseMethod() { - + } } - + } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_method.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_method.java index b22e715563..d03eefeb14 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_method.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/BaseFile_method.java @@ -1,17 +1,14 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public class FooBar { - + public FooBar() { - + } void baseMethod() { - + } - + } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_encoding.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_encoding.java index fc84f76b6c..cdb5be21ae 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_encoding.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_encoding.java @@ -1,10 +1,7 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public class FooBar { - + } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_field.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_field.java index 68d31b49a4..7ea961a536 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_field.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_field.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public class FooBar @@ -8,5 +5,5 @@ public class FooBar private int baseField = 1; private int patchField = 0; - + } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_generics.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_generics.java index e25d0c59eb..2bc707175a 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_generics.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_generics.java @@ -1,13 +1,10 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public abstract class Clazz { - + public void inspect(String a) { - + } } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_import.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_import.java index 4dff85b56e..11a5b0fb40 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_import.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_import.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; import com.capgemini.conflicting.BaseClassImport; @@ -8,5 +5,5 @@ public class FooBar { - + } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_innerClass.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_innerClass.java index 77d27705b2..02b787f05a 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_innerClass.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_innerClass.java @@ -1,33 +1,30 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public class FooBar { - + enum BaseEnum { PATCH_VALUE } - + enum PatchEnum { PATCH_VALUE } - + private class InnerBaseClass { - + private int innerBaseField = 1; private int innerPatchField = 0; - + enum InnerBaseEnum { INNER_PATCH_VALUE } - + String innerBaseMethod() { return null; } - + String innerPatchMethod(String string) { return null; } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_method.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_method.java index ff638a4b17..35a54a2dff 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_method.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/PatchFile_method.java @@ -1,23 +1,20 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public class FooBar { - + public FooBar() { super(); } - + public FooBar(String abc) { - + } void patchMethod(String string) { - + } - + String baseMethod() { return null; } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_field.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_field.java index 2155e37ac4..a017548c37 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_field.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_field.java @@ -1,11 +1,8 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public class FooBar { - + private int baseFieldUndefined; } diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_generics.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_generics.java index dff418a5a5..0dc0956984 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_generics.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_generics.java @@ -1,10 +1,7 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public abstract class Clazz extends Map { - + private T t; public void set(T t) { diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_header.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_header.java index 387c720939..115d1d37e4 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_header.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_header.java @@ -1,6 +1,3 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ /* HEADER */ package com.capgemini; diff --git a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_modifiers.java b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_modifiers.java index f0f5e0de2b..58eac5c268 100644 --- a/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_modifiers.java +++ b/cobigen/cobigen-javaplugin/src/test/resources/com/capgemini/cobigen/javaplugin/test/merger/libextension/ClassFile_modifiers.java @@ -1,19 +1,16 @@ -/******************************************************************************* - * Copyright © Capgemini 2013. All rights reserved. - ******************************************************************************/ package com.capgemini; public final class FooBar { - + private static final volatile int baseFieldUndefined; - + public final void method1(String parameter) { - + } - + method2(final String parameter) { - + } }