diff --git a/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml b/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
--- a/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
+++ b/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
@@ -75,14 +75,28 @@
     <codetemplate abbreviation="serr"><code><![CDATA[System.err.println("${cursor}");]]></code></codetemplate> 
     <codetemplate abbreviation="sout"><code><![CDATA[System.out.println("${cursor}");]]></code></codetemplate> 
     <codetemplate abbreviation="st"><code><![CDATA[static ]]></code></codetemplate> 
-    <codetemplate abbreviation="sw"><code><![CDATA[switch (]]></code></codetemplate> 
+    <codetemplate abbreviation="sw"><code><![CDATA[switch (${var instanceof="java.lang.Enum"}) {
+        case ${what}:
+            ${cursor}
+            break;
+        default:
+            throw new AssertionError();
+    }
+]]></code></codetemplate>
+    <codetemplate abbreviation="cs"><code><![CDATA[case ${what}:
+            ${cursor}
+            break;
+]]></code></codetemplate> 
+    <codetemplate abbreviation="tw"><code><![CDATA[throw ${exc instanceof="java.lang.Throwable}]]></code></codetemplate> 
+    <codetemplate abbreviation="twn"><code><![CDATA[throw new ${exc default="IllegalStateException"}("${arg}");]]></code></codetemplate> 
+    <codetemplate abbreviation="wh"><code><![CDATA[while (${expr instanceof="boolean" default="true"}) {
+        ${cursor}
+    }
+]]></code></codetemplate> 
+
     <codetemplate abbreviation="sy"><code><![CDATA[synchronized ]]></code></codetemplate> 
     <codetemplate abbreviation="tds"><code><![CDATA[Thread.dumpStack();]]></code></codetemplate> 
     <codetemplate abbreviation="th"><code><![CDATA[throws ]]></code></codetemplate> 
-    <codetemplate abbreviation="tw"><code><![CDATA[throw ]]></code></codetemplate> 
-    <codetemplate abbreviation="twn"><code><![CDATA[throw new ]]></code></codetemplate> 
-    <codetemplate abbreviation="wh"><code><![CDATA[while (]]></code></codetemplate> 
-
     <codetemplate abbreviation="En"><code><![CDATA[Enumeration]]></code></codetemplate> 
     <codetemplate abbreviation="Ex"><code><![CDATA[Exception]]></code></codetemplate> 
     <codetemplate abbreviation="Ob"><code><![CDATA[Object]]></code></codetemplate> 
@@ -246,7 +260,7 @@
 
     <codetemplate abbreviation="bcom">
         <code>
-<![CDATA[/*${selection}*/]]>
+<![CDATA[/*${cursor}*/]]>
         </code>
     </codetemplate>
 
@@ -258,4 +272,176 @@
         </code>
     </codetemplate>
 
+    <!-- Added in 6.8 -->
+
+    <!-- Arrays and List conversion and sorting -->
+    <codetemplate abbreviation="2arr" contexts="BLOCK,CASE" descriptionId="CT_fori">
+         <code>
+ <![CDATA[${clazz}[] ${var newVarName default="arr"} = (${clazz}[]) ${coll instanceof="java.util.Collection"}.toArray(new ${clazz}[${coll}.size()]);
+ ]]>
+         </code>
+     </codetemplate>
+
+     <codetemplate abbreviation="2l"><code><![CDATA[${ltype type="java.util.List" default="List" editable="false"}<${arrType type="java.lang.String" default="String"}> ${var newVarName default="l"} = ${arrays type="java.util.Arrays" default="Arrays" editable="false"}.asList(${arr array});
+]]></code></codetemplate>
+     <codetemplate abbreviation="2nl"><code><![CDATA[${baseType type="java.util.List" default="List" editable="false"} <${type default="String"}> ${var newVarName default="l"} = new ${listType type="java.util.ArrayList" default="ArrayList" editable=false} <${type}>(
+ ${arrays type="java.util.Arrays" default="Arrays" editable="false"}.asList(${arr array});
+         ${cursor}
+ ]]></code></codetemplate>
+     <codetemplate abbreviation="2s"><code><![CDATA[${baseType type="java.util.Set" default="Set" editable="false"} <${type default="String"}> ${var newVarName default="s"} = new ${listType type="java.util.HashSet" default="HashSet" editable=false} <${type}>(${arrays type="java.util.Arrays" default="Arrays" editable="false"}.asList(${arr array}));
+         ${cursor}]]></code></codetemplate>
+     <codetemplate abbreviation="asort"><code><![CDATA[${baseType type="java.util.Arrays" default="Arrays" editable="false"}.sort (${var array});
+     ${cursor}]]></code></codetemplate>
+     <codetemplate abbreviation="csort"><code><![CDATA[${collsType type="java.util.Collections" default="Collections" editable="false"}.sort(${var instanceof="java.util.List"};
+         ${cursor}]]></code></codetemplate>
+
+     <!-- Instantiating common classes -->
+
+     <codetemplate abbreviation="map"><code><![CDATA[${map type="java.util.Map" default="Map" editable="false"}<${keytype default="String"},${valtype default="String"}> ${var newVarName default="m"} = new ${mtype type="java.util.HashMap"}<${keytype},${valtype}>(${cursor});
+]]></code></codetemplate>
+     <codetemplate abbreviation="set"><code><![CDATA[${stype type="java.util.Set" default="Set" editable="false"}<${paramType default="String"}> ${var newVarName default="s"} = new ${setType type="java.util.HashSet" editable="false"}<${paramType}>();
+    ${cursor}]]></code></codetemplate>
+     <codetemplate abbreviation="arl"><code><![CDATA[${baseType type="java.util.List" default="List" editable="false"} <${type default="String"}> ${var newVarName default="l"} = new ${listType type="java.util.ArrayList" default="ArrayList" editable=false} <${type}>(${arg default=""});
+         ${cursor}
+ ]]></code></codetemplate>
+     <codetemplate abbreviation="ll"><code><![CDATA[${stype type="java.util.List" default="Set" editable="false"}<${paramType default="String"}> ${var newVarName default="s"} = new ${setType type="java.util.LinkedList" editable="false"}<${paramType}>();
+    ${cursor}]]></code></codetemplate>
+     <codetemplate abbreviation="al"><code><![CDATA[${stype type="java.util.List" default="Set" editable="false"}<${paramType default="String"}> ${var newVarName default="s"} = new ${setType type="java.util.ArrayList" editable="false"}<${paramType}>();
+    ${cursor}]]></code></codetemplate>
+
+     <!-- Miscellaneous common code patterns -->
+     <codetemplate abbreviation="rn"><code><![CDATA[return null;]]></code></codetemplate>
+     <codetemplate abbreviation="f"><code><![CDATA[final ]]></code></codetemplate>
+     <codetemplate abbreviation="ps"><code><![CDATA[private static ]]></code></codetemplate>
+     <codetemplate abbreviation="Ps"><code><![CDATA[public static ]]></code></codetemplate>
+     <codetemplate abbreviation="pf"><code><![CDATA[private final ]]></code></codetemplate>
+     <codetemplate abbreviation="Pf"><code><![CDATA[public final ]]></code></codetemplate>
+     <codetemplate abbreviation="spl"><code><![CDATA[
+        for (String ${str newVarName default="s"} : ${string instanceof="java.lang.String"}.split("${expr default=","}")) {
+            ${cursor}
+        }
+     ]]></code></codetemplate>
+    <codetemplate abbreviation="n">
+        <!-- keep newo for people who are used to it, but this is easier -->
+        <code>
+        <![CDATA[${TYPE default="Object"} ${OBJ newVarName default="obj"} = new ${TYPE}(${cursor});]]>
+        </code>
+    </codetemplate>
+
+     <!-- Public method generation -->
+
+     <codetemplate abbreviation="Pm"><code><![CDATA[    public ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="Pfm"><code><![CDATA[    public final ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="Psfm"><code><![CDATA[    public final ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+
+     <!-- Protected method generation -->
+
+     <codetemplate abbreviation="prm"><code><![CDATA[    protected ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="prfm"><code><![CDATA[    protected final ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="prsfm"><code><![CDATA[    protected static final ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+
+
+     <!-- Private method generation -->
+
+     <codetemplate abbreviation="pm"><code><![CDATA[    private ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="pfm"><code><![CDATA[    private final ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="psfm"><code><![CDATA[    private static final ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+
+     <codetemplate abbreviation="m"><code><![CDATA[    ${private} ${static} ${final} ${ret default="void"} ${mname default="method"}(${args}) {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+
+
+     <!-- Inner class generation -->
+
+     <codetemplate abbreviation="pfc"><code><![CDATA[private final class ${Type} {
+        ${Type}() {
+            ${cursor}
+        }
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="psfc"><code><![CDATA[private static final class ${Type} {
+        ${Type}() {
+            ${cursor}
+        }
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="sfc"><code><![CDATA[static final class ${Type} {
+        ${Type}() {
+            ${cursor}
+        }
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="sc"><code><![CDATA[static class ${Type} {
+        ${Type}() {
+            ${cursor}
+        }
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="fc"><code><![CDATA[final class ${Type} {
+        ${Type}() {
+            ${cursor}
+        }
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="ic"><code><![CDATA[class ${Type} {
+        ${Type}() {
+            ${cursor}
+        }
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="cl"><code><![CDATA[${private} ${static} ${final} class ${Type} {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+     <codetemplate abbreviation="cli"><code><![CDATA[${private} ${static} ${final} class ${Type} implements ${Iface} {
+        ${cursor}
+     }
+     ]]></code></codetemplate>
+    <codetemplate abbreviation="if" contexts="BLOCK,CASE" descriptionId="CT_iff">
+        <code>
+<![CDATA[if (${EXP instanceof="boolean" default="exp"}) {
+   ${selection}${cursor}
+}
+]]>
+        </code>
+    </codetemplate>
+    <codetemplate abbreviation="ife" contexts="BLOCK,CASE" descriptionId="CT_ifelse">
+        <code>
+<![CDATA[if (${EXP instanceof="boolean" default="exp"}) {
+   ${selection}${cursor}
+} else {
+}
+]]>
+        </code>
+    </codetemplate>
+
 </codetemplates>