-fix merge

mplushnikov · Mar 9, 2014 · ad8cb07 · ad8cb07
1 parent 68f39ec
commit ad8cb07
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/lombok-api/lombok-api.iml b/lombok-api/lombok-api.iml
@@ -15,7 +15,6 @@
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/lombok-plugin/src/main/resources/META-INF/plugin.xml b/lombok-plugin/src/main/resources/META-INF/plugin.xml
@@ -152,6 +152,18 @@
   <!--<li>TODO: Add delombok action for @Cleanup, @Synchronized and other annotations</li>-->
   <change-notes><![CDATA[
 		<ul>
+		  <li>0.8.2
+				<ol>
+		        <li>Added support for "topic" annotation value of all @Log annotations (Lombok >= 1.12.6)</li>
+				    <li>Added validation of static fields/methods of @Delegate annotation (@Delegate is legal only on instance fields or no-argument instance methods)</li>
+				    <li>Fixed #19: Slf4j in static context</li>
+				    <li>Fixed #29: Renaming a class with the @Log* annotation adds extra qualification to calls</li>
+				    <li>Fixed #31: Prevent errors with invalid identifiers for builderClassName in @Builder annotation</li>
+				    <li>Fixed #32: Refactor -> Extract -> Parameter Object || Change Signature broken</li>
+				    <li>Fixed (on GoogleCode) #83: @Slf4j does not work when added for first time</li>
+				    <li>Fixed (on GoogleCode) #100:	Refactor Change Signature || Extract - Parameter Object</li>
+		     </ol>
+	    </li>
 		<li>0.8.1
 				<ol>
 				    <li>Issue (on Git) #23: Fixed @Delegate inspection reports error</li>

diff --git a/lombok-plugin/src/test/java/de/plushnikov/lombok/LombokLightCodeInsightTestCase.java b/lombok-plugin/src/test/java/de/plushnikov/lombok/LombokLightCodeInsightTestCase.java
@@ -24,11 +24,6 @@ public abstract class LombokLightCodeInsightTestCase extends LightCodeInsightFix
   private static final String LOMBOK_SRC_PATH = "./lombok-api/target/generated-sources/lombok";
   private static final String LOMBOKPG_SRC_PATH = "./lombok-api/target/generated-sources/lombok-pg";
 
-//  @Override
-//  protected String getTestDataPath() {
-//    return ".";
-//  }
-
   @Override
   protected String getBasePath() {
     return "lombok-plugin/src/test/data";
@@ -77,7 +72,7 @@ protected void checkResultByFile(String expectedFile) throws IOException {
       String actualFileText = myFixture.getFile().getText();
       actualFileText = actualFileText.replace("java.lang.", "");
 
-      final String path = getTestDataPath() + "/" + expectedFile;
+      final String path = "." + "/" + expectedFile;
       String expectedFileText = StringUtil.convertLineSeparators(FileUtil.loadFile(new File(path)));
 
       assertEquals(expectedFileText.replaceAll("\\s+", ""), actualFileText.replaceAll("\\s+", ""));