FELIX-4249 - Make the default error location 1,1 instead of 0,0. Apply patch from Robert Munteanu
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1527457 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/generator/changelog.txt b/scrplugin/generator/changelog.txt
index 5384f79..61180bb 100644
--- a/scrplugin/generator/changelog.txt
+++ b/scrplugin/generator/changelog.txt
@@ -1,5 +1,7 @@
Changes from 1.8.2 to 1.8.0
---------------------------
+** Improvement
+ * [FELIX-4249] - Make the default error location 1,1 instead of 0,0
** Bug
* [FELIX-4192] - SCR Generator fails with a NPE in case a class level Reference doesn't define a referenceInterface
* [FELIX-4010] - SCR Plugin aborts when scanning a Java 8 class file
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
index c132fb7..1fae0c0 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
@@ -101,10 +101,10 @@
}
private static class Entry {
-
- static final int LINE_NUMBER_UNKNOWN = 0;
- static final int COLUMN_NUMBER_UNKNOWN = 0;
-
+
+ static final int LINE_NUMBER_UNKNOWN = 1;
+ static final int COLUMN_NUMBER_UNKNOWN = 1;
+
final String message;
final String location;
final int lineNumber;
@@ -120,8 +120,8 @@
this.lineNumber = lineNumber;
this.columnNumber = columnNumber;
}
-
-
+
+
@Override
public String toString() {
return this.location + " [" + this.lineNumber+ "," + this.columnNumber+"] : " + this.message;
diff --git a/scrplugin/maven-scr-plugin/changelog.txt b/scrplugin/maven-scr-plugin/changelog.txt
index 38028be..68e33b1 100644
--- a/scrplugin/maven-scr-plugin/changelog.txt
+++ b/scrplugin/maven-scr-plugin/changelog.txt
@@ -2,6 +2,7 @@
-----------------------------
** Improvements
* [FELIX-4241] - Change default output directory for SCR annotations to ${project.build.directory}/classes
+ * [FELIX-4249] - Make the default error location 1,1 instead of 0,0
** Bug
* [FELIX-4192] - SCR Generator fails with a NPE in case a class level Reference doesn't define a referenceInterface
* [FELIX-4010] - SCR Plugin aborts when scanning a Java 8 class file
diff --git a/scrplugin/scrtask/changelog.txt b/scrplugin/scrtask/changelog.txt
index 99cebb8..9ec4b8d 100644
--- a/scrplugin/scrtask/changelog.txt
+++ b/scrplugin/scrtask/changelog.txt
@@ -1,5 +1,7 @@
Changes from 1.9.0 to 1.8.0
---------------------------
+** Improvement
+ * [FELIX-4249] - Make the default error location 1,1 instead of 0,0
** Bug
* [FELIX-4192] - SCR Generator fails with a NPE in case a class level Reference doesn't define a referenceInterface
* [FELIX-4010] - SCR Plugin aborts when scanning a Java 8 class file