Merge branch 'development'

oyse · Oct 4, 2014 · bed8026 · bed8026
2 parents fd69832 + d469cf8
commit bed8026
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 8 deletions.
diff --git a/org.dadacoalition.yedit.feature/feature.xml b/org.dadacoalition.yedit.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.dadacoalition.yedit"
       label="YEdit Feature"
-      version="1.0.15"
+      version="1.0.16"
       provider-name="YEdit Project">
 
    <description>
@@ -118,7 +118,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
          id="org.dadacoalition.yedit"
          download-size="0"
          install-size="0"
-         version="1.0.15"
+         version="1.0.16"
          unpack="false"/>
 
 </feature>
diff --git a/org.dadacoalition.yedit.update/site.xml b/org.dadacoalition.yedit.update/site.xml
@@ -3,7 +3,7 @@
    <description url="http://dadacoalition.org/yedit">
       YEdit is an editor for editing YAML files. It is implemented as an Eclipse plugin.
    </description>
-   <feature url="features/org.dadacoalition.yedit_1.0.15.jar" id="org.dadacoalition.yedit" version="1.0.15">
+   <feature url="features/org.dadacoalition.yedit_1.0.16.jar" id="org.dadacoalition.yedit" version="1.0.16">
       <category name="YEdit"/>
    </feature>
    <category-def name="YEdit" label="YEdit"/>

diff --git a/org.dadacoalition.yedit/META-INF/MANIFEST.MF b/org.dadacoalition.yedit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: YEdit YAML editor
 Bundle-SymbolicName: org.dadacoalition.yedit;singleton:=true
-Bundle-Version: 1.0.15
+Bundle-Version: 1.0.16
 Bundle-Activator: org.dadacoalition.yedit.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -11,8 +11,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.views,
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
- org.eclipse.ui.workbench.texteditor,
- org.apache.commons.lang;bundle-version="2.6.0"
+ org.eclipse.ui.workbench.texteditor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.dadacoalition.yedit;uses:="org.eclipse.ui.plugin,org.osgi.framework",

diff --git a/org.dadacoalition.yedit/src/org/dadacoalition/yedit/Utils.java b/org.dadacoalition.yedit/src/org/dadacoalition/yedit/Utils.java
@@ -0,0 +1,40 @@
+package org.dadacoalition.yedit;
+
+import java.util.Collection;
+
+/**
+ * Various utility functions.
+ */
+public class Utils {
+
+    private Utils(){}
+
+    /**
+     * Join each element in a collection using a string separator
+     * @param collection The collection to join
+     * @param separator The separator to use
+     * @return A string where the toString method on each object in the collection has been called and each element is
+     * separated with the separator string.
+     */
+    public static String joinAsString(Collection<? extends Object> collection, String separator){               
+
+        if(collection.isEmpty()){
+            return "";
+        }
+
+        StringBuilder result = new StringBuilder();
+        boolean first = true;
+        for( Object o : collection ){
+
+            if(first){
+                first = false;
+            } else {
+                result.append(separator);
+            }
+            result.append(o.toString());
+
+        }
+        return result.toString();
+    }
+
+}
diff --git a/org.dadacoalition.yedit/src/org/dadacoalition/yedit/formatter/YamlFormatter.java b/org.dadacoalition.yedit/src/org/dadacoalition/yedit/formatter/YamlFormatter.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.dadacoalition.yedit.Utils;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.DumperOptions.FlowStyle;
 import org.yaml.snakeyaml.DumperOptions.ScalarStyle;
@@ -86,7 +86,7 @@ public String formatDocuments(Iterable<Object> documents){
         if( formattedDocuments.isEmpty()){
             return formatDocument(null);
         } else {        
-            return StringUtils.join(formattedDocuments, System.lineSeparator());
+            return Utils.joinAsString(formattedDocuments, System.lineSeparator());
         }
     }