From cd160e9b181958ddd1698e1f5432b91099812166 Mon Sep 17 00:00:00 2001 From: Jakub Valtar Date: Sat, 7 May 2016 00:17:05 +0200 Subject: [PATCH] Fix indents in ImportStatement --- .../mode/java/pdex/ImportStatement.java | 140 +++++++++--------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/java/src/processing/mode/java/pdex/ImportStatement.java b/java/src/processing/mode/java/pdex/ImportStatement.java index 83373778b..fc4d4d278 100644 --- a/java/src/processing/mode/java/pdex/ImportStatement.java +++ b/java/src/processing/mode/java/pdex/ImportStatement.java @@ -31,97 +31,97 @@ import java.util.regex.Matcher; */ public class ImportStatement { - private static final String importKw = "import"; - private static final String staticKw = "static"; + private static final String importKw = "import"; + private static final String staticKw = "static"; - private boolean isClass; - private boolean isStarred; - private boolean isStatic; + private boolean isClass; + private boolean isStarred; + private boolean isStatic; - /** - * Full class name of the import with all packages - * Ends with star for starred imports - */ - private String className; + /** + * Full class name of the import with all packages + * Ends with star for starred imports + */ + private String className; - /** - * Name of the package e.g. everything before last dot - */ - private String packageName; + /** + * Name of the package e.g. everything before last dot + */ + private String packageName; - private ImportStatement() { } + private ImportStatement() { } - public static ImportStatement wholePackage(String pckg) { - ImportStatement is = new ImportStatement(); - is.packageName = pckg; - is.className = "*"; - is.isStarred = true; - return is; - } + public static ImportStatement wholePackage(String pckg) { + ImportStatement is = new ImportStatement(); + is.packageName = pckg; + is.className = "*"; + is.isStarred = true; + return is; + } - public static ImportStatement singleClass(String cls) { - ImportStatement is = new ImportStatement(); - int lastDot = cls.lastIndexOf('.'); - is.className = lastDot >= 0 ? cls.substring(lastDot+1) : cls; - is.packageName = lastDot >= 0 ? cls.substring(0, lastDot) : ""; - is.isClass = true; - return is; - } + public static ImportStatement singleClass(String cls) { + ImportStatement is = new ImportStatement(); + int lastDot = cls.lastIndexOf('.'); + is.className = lastDot >= 0 ? cls.substring(lastDot+1) : cls; + is.packageName = lastDot >= 0 ? cls.substring(0, lastDot) : ""; + is.isClass = true; + return is; + } - public static ImportStatement parse(String importString) { - Matcher matcher = SourceUtils.IMPORT_REGEX_NO_KEYWORD.matcher(importString); - if (!matcher.find()) return null; + public static ImportStatement parse(String importString) { + Matcher matcher = SourceUtils.IMPORT_REGEX_NO_KEYWORD.matcher(importString); + if (!matcher.find()) return null; - return parse(matcher.toMatchResult()); - } + return parse(matcher.toMatchResult()); + } - public static ImportStatement parse(MatchResult match) { - ImportStatement is = new ImportStatement(); + public static ImportStatement parse(MatchResult match) { + ImportStatement is = new ImportStatement(); - is.isStatic = match.group(2) != null; - String pckg = match.group(3); - pckg = (pckg == null) ? "" : pckg.replaceAll("\\s",""); - is.packageName = pckg.endsWith(".") ? - pckg.substring(0, pckg.length()-1) : - pckg; + is.isStatic = match.group(2) != null; + String pckg = match.group(3); + pckg = (pckg == null) ? "" : pckg.replaceAll("\\s",""); + is.packageName = pckg.endsWith(".") ? + pckg.substring(0, pckg.length()-1) : + pckg; - is.className = match.group(4); - is.isStarred = is.className.equals("*"); + is.className = match.group(4); + is.isStarred = is.className.equals("*"); - return is; - } + return is; + } - public String getFullSourceLine() { - return importKw + " " + (isStatic ? (staticKw + " ") : "") + packageName + "." + className + ";"; - } + public String getFullSourceLine() { + return importKw + " " + (isStatic ? (staticKw + " ") : "") + packageName + "." + className + ";"; + } - public String getFullClassName(){ - return packageName + "." + className; - } + public String getFullClassName(){ + return packageName + "." + className; + } - public String getClassName(){ - return className; - } + public String getClassName(){ + return className; + } - public String getPackageName(){ - return packageName; - } + public String getPackageName(){ + return packageName; + } - public boolean isStarredImport() { - return isStarred; - } + public boolean isStarredImport() { + return isStarred; + } - public boolean isStaticImport() { - return isStatic; - } + public boolean isStaticImport() { + return isStatic; + } - public boolean isSameAs(ImportStatement is) { - return packageName.equals(is.packageName) && - className.equals(is.className) && - isStatic == is.isStatic; - } + public boolean isSameAs(ImportStatement is) { + return packageName.equals(is.packageName) && + className.equals(is.className) && + isStatic == is.isStatic; + } } \ No newline at end of file