From d99daec7de124de449a107be40a30b4695481416 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 10 Sep 2012 21:11:11 +0400 Subject: [PATCH] Minor. Renamed fields, optimized imports, added 'final'. --- .../JetContentBasedFileSubstitutor.java | 1 - .../JetDummyClassFileViewProvider.java | 28 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java index 476b205ed32..80a14eff7b2 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java @@ -23,7 +23,6 @@ import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiFile; import com.intellij.psi.impl.compiled.ClsFileImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java index 6348b7be1db..97c33a643ed 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java @@ -37,23 +37,23 @@ import java.util.Set; * @since 3/2/12 */ class JetDummyClassFileViewProvider extends UserDataHolderBase implements FileViewProvider { - private String myText; - private final PsiManager myManager; - private JetFile myJetFile = null; - private final VirtualFile myVirtualFile; + private final String text; + private final PsiManager manager; + private JetFile jetFile = null; + private final VirtualFile virtualFile; public JetDummyClassFileViewProvider(@NotNull PsiManager manager, @NotNull VirtualFile file, String text) { - myManager = manager; - myVirtualFile = file; - myText = text; + this.manager = manager; + virtualFile = file; + this.text = text; - myJetFile = new JetFile(this); + jetFile = new JetFile(this); } @Override @NotNull public PsiManager getManager() { - return myManager; + return manager; } @Override @@ -65,13 +65,13 @@ class JetDummyClassFileViewProvider extends UserDataHolderBase implements FileVi @Override @NotNull public String getContents() { - return myText; + return text; } @Override @NotNull public VirtualFile getVirtualFile() { - return myVirtualFile; + return virtualFile; } @Override @@ -91,13 +91,13 @@ class JetDummyClassFileViewProvider extends UserDataHolderBase implements FileVi if (JetLanguage.INSTANCE != target) { return null; } - return myJetFile; + return jetFile; } @Override @NotNull public List getAllFiles() { - return Collections.singletonList(myJetFile); + return Collections.singletonList(jetFile); } @Override @@ -159,7 +159,7 @@ class JetDummyClassFileViewProvider extends UserDataHolderBase implements FileVi @Override public PsiElement findElementAt(final int offset) { - LeafElement element = myJetFile.calcTreeElement().findLeafElementAt(offset); + LeafElement element = jetFile.calcTreeElement().findLeafElementAt(offset); return element != null ? element.getPsi() : null; }