From a96230336fd9065523f534d56389c78a93bf9a8a Mon Sep 17 00:00:00 2001 From: honfika Date: Sat, 19 Jul 2014 22:44:18 +0200 Subject: [PATCH] curly brace position fixed after interface keyword --- .../model/clauses/InterfaceActionItem.java | 165 +++++++++--------- 1 file changed, 82 insertions(+), 83 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java b/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java index 85c101a72..21bd950ce 100644 --- a/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java +++ b/src/com/jpexs/decompiler/flash/action/model/clauses/InterfaceActionItem.java @@ -1,83 +1,82 @@ -/* - * Copyright (C) 2010-2014 JPEXS - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.jpexs.decompiler.flash.action.model.clauses; - -import com.jpexs.decompiler.flash.SourceGeneratorLocalData; -import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.model.ActionItem; -import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; -import com.jpexs.decompiler.flash.helpers.GraphTextWriter; -import com.jpexs.decompiler.graph.CompilationException; -import com.jpexs.decompiler.graph.GraphSourceItem; -import com.jpexs.decompiler.graph.GraphTargetItem; -import com.jpexs.decompiler.graph.SourceGenerator; -import com.jpexs.decompiler.graph.model.LocalData; -import java.util.ArrayList; -import java.util.List; - -/** - * - * @author JPEXS - */ -public class InterfaceActionItem extends ActionItem { - - public GraphTargetItem name; - public List superInterfaces; - - public InterfaceActionItem(GraphTargetItem name, List superInterfaces) { - super(null, NOPRECEDENCE); - this.name = name; - this.superInterfaces = superInterfaces; - } - - @Override - public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { - writer.append("interface "); - name.toStringNoQuotes(writer, localData); - boolean first = true; - if (!superInterfaces.isEmpty()) { - writer.append(" extends "); - } - for (GraphTargetItem ti : superInterfaces) { - if (!first) { - writer.append(", "); - } - first = false; - Action.getWithoutGlobal(ti).toStringNoQuotes(writer, localData); - } - writer.newLine(); - return writer.startBlock().endBlock(); - } - - @Override - public boolean needsSemicolon() { - return false; - } - - @Override - public List toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException { - List ret = new ArrayList<>(); - ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; - ret.addAll(asGenerator.generateTraits(localData, true, name, null, superInterfaces, null, null, null, null, null)); - return ret; - } - - @Override - public boolean hasReturnValue() { - return false; - } -} +/* + * Copyright (C) 2010-2014 JPEXS + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.jpexs.decompiler.flash.action.model.clauses; + +import com.jpexs.decompiler.flash.SourceGeneratorLocalData; +import com.jpexs.decompiler.flash.action.Action; +import com.jpexs.decompiler.flash.action.model.ActionItem; +import com.jpexs.decompiler.flash.action.parser.script.ActionSourceGenerator; +import com.jpexs.decompiler.flash.helpers.GraphTextWriter; +import com.jpexs.decompiler.graph.CompilationException; +import com.jpexs.decompiler.graph.GraphSourceItem; +import com.jpexs.decompiler.graph.GraphTargetItem; +import com.jpexs.decompiler.graph.SourceGenerator; +import com.jpexs.decompiler.graph.model.LocalData; +import java.util.ArrayList; +import java.util.List; + +/** + * + * @author JPEXS + */ +public class InterfaceActionItem extends ActionItem { + + public GraphTargetItem name; + public List superInterfaces; + + public InterfaceActionItem(GraphTargetItem name, List superInterfaces) { + super(null, NOPRECEDENCE); + this.name = name; + this.superInterfaces = superInterfaces; + } + + @Override + public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { + writer.append("interface "); + name.toStringNoQuotes(writer, localData); + boolean first = true; + if (!superInterfaces.isEmpty()) { + writer.append(" extends "); + } + for (GraphTargetItem ti : superInterfaces) { + if (!first) { + writer.append(", "); + } + first = false; + Action.getWithoutGlobal(ti).toStringNoQuotes(writer, localData); + } + return writer.startBlock().endBlock(); + } + + @Override + public boolean needsSemicolon() { + return false; + } + + @Override + public List toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException { + List ret = new ArrayList<>(); + ActionSourceGenerator asGenerator = (ActionSourceGenerator) generator; + ret.addAll(asGenerator.generateTraits(localData, true, name, null, superInterfaces, null, null, null, null, null)); + return ret; + } + + @Override + public boolean hasReturnValue() { + return false; + } +}