ts editable postfix templates

java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaEditablePostfixTemplate.java

@@ -26,7 +26,7 @@ import java.util.Objects;
 import java.util.Set;
 
 public class JavaEditablePostfixTemplate
-  extends EditablePostfixTemplateWithConditions<JavaPostfixTemplateExpressionCondition> {
+  extends EditablePostfixTemplateWithMultipleExpressions<JavaPostfixTemplateExpressionCondition> {
   private static final Condition<PsiElement> PSI_ERROR_FILTER = element -> !PsiTreeUtil.hasErrorElements(element);
 
   @NotNull private final LanguageLevel myMinimumLanguageLevel;

java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateEditor.java

@@ -108,22 +108,7 @@ public class JavaPostfixTemplateEditor extends PostfixTemplateEditorBase<JavaPos
       myLanguageLevelCombo.setSelectedItem(((JavaEditablePostfixTemplate)template).getMinimumLanguageLevel());
     }
   }
-
-  private class AddConditionAction extends DumbAwareAction {
-    @NotNull
-    private final JavaPostfixTemplateExpressionCondition myCondition;
-
-    public AddConditionAction(JavaPostfixTemplateExpressionCondition condition) {
-      super(condition.getPresentableName());
-      myCondition = condition;
-    }
-
-    @Override
-    public void actionPerformed(AnActionEvent e) {
-      myExpressionTypesListModel.addElement(myCondition);
-    }
-  }
-
+  
   private class ChooseClassAction extends DumbAwareAction {
     @Nullable
     private final Project myProject;

java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateExpressionCondition.java

@@ -27,7 +27,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     }
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       PsiType type = element.getType();
       return type != null && InheritanceUtil.isInheritor(type, myFqn);
     }
@@ -68,7 +68,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "void";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       PsiType type = element.getType();
       return type != null && PsiType.VOID.equals(type);
     }
@@ -102,7 +102,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "non void";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isNonVoid(element.getType());
     }
 
@@ -134,7 +134,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "boolean";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isBoolean(element.getType());
     }
 
@@ -166,7 +166,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "number";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isNumber(element.getType());
     }
 
@@ -198,7 +198,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "notPrimitive";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isNotPrimitiveTypeExpression(element);
     }
 
@@ -230,7 +230,7 @@ public interface JavaPostfixTemplateExpressionCondition extends PostfixTemplateE
     public static final String ID = "array";
 
     @Override
-    public boolean value(PsiExpression element) {
+    public boolean value(@NotNull PsiExpression element) {
       return JavaPostfixTemplatesUtils.isArray(element.getType());
     }