You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/06/21 15:39:06 UTC
svn commit: r1352532 -
/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
Author: pieber
Date: Thu Jun 21 13:39:06 2012
New Revision: 1352532
URL: http://svn.apache.org/viewvc?rev=1352532&view=rev
Log:
[KARAF-1571] Make InstallKarsMojo compatible to java7; Thx to Christoph Gritschenberger for the patch!
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java?rev=1352532&r1=1352531&r2=1352532&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java Thu Jun 21 13:39:06 2012
@@ -577,33 +577,6 @@ public class InstallKarsMojo extends Moj
}
}
- public String put(String key, List<String> commentLines, List<String> valueLines) {
- commentLines = new ArrayList<String>(commentLines);
- valueLines = new ArrayList<String>(valueLines);
- String escapedKey = escapeKey(key);
- int lastLine = valueLines.size() - 1;
- if (valueLines.isEmpty()) {
- valueLines.add(escapedKey + "=");
- } else if (!valueLines.get(0).trim().startsWith(escapedKey)) {
- valueLines.set(0, escapedKey + " = " + escapeJava(valueLines.get(0)) + (0 < lastLine ? "\\" : ""));
- }
- for (int i = 1; i < valueLines.size(); i++) {
- valueLines.set(i, escapeJava(valueLines.get(i)) + (i < lastLine ? "\\" : ""));
- }
- StringBuilder value = new StringBuilder();
- for (String line : valueLines) {
- value.append(line);
- }
- layout.put(key, new Layout(commentLines, valueLines));
- return storage.put(key, unescapeJava(value.toString()));
- }
-
- public String put(String key, List<String> commentLines, String value) {
- commentLines = new ArrayList<String>(commentLines);
- layout.put(key, new Layout(commentLines, null));
- return storage.put(key, value);
- }
-
public String put(String key, String comment, String value) {
return put(key, Collections.singletonList(comment), value);
}