MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: remove unused parameter

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-10-04 18:39:40 +03:00
committed by Aleksey Pivovarov
parent 0565a1dfaa
commit e38daa213b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/DiffContentFactoryImpl.java
+5 -7
View File
@@ -46,7 +46,6 @@ import org.jetbrains.annotations.Nullable;
import java.awt.datatransfer.DataFlavor;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
public class DiffContentFactoryImpl extends DiffContentFactoryEx {
public static final Logger LOG = Logger.getInstance(DiffContentFactoryImpl.class);
@@ -104,20 +103,20 @@ public class DiffContentFactoryImpl extends DiffContentFactoryEx {
@NotNull
@Override
public DocumentContent create(@Nullable Project project, @NotNull String text, @Nullable FileType type, boolean respectLineSeparators) {
return createImpl(project, text, type, null, null, respectLineSeparators, true);
return createImpl(project, text, type, null, respectLineSeparators, true);
}
@NotNull
@Override
public DocumentContent create(@Nullable Project project, @NotNull String text, @Nullable VirtualFile highlightFile) {
return createImpl(project, text, highlightFile != null ? highlightFile.getFileType() : null, highlightFile, null, true, true);
return createImpl(project, text, highlightFile != null ? highlightFile.getFileType() : null, highlightFile, true, true);
}
@NotNull
@Override
public DocumentContent create(@Nullable Project project, @NotNull String text, @Nullable DocumentContent referent) {
if (referent == null) return create(text);
return createImpl(project, text, referent.getContentType(), referent.getHighlightFile(), null, false, true);
return createImpl(project, text, referent.getContentType(), referent.getHighlightFile(), false, true);
}
@@ -226,7 +225,7 @@ public class DiffContentFactoryImpl extends DiffContentFactoryEx {
FileType type = referent != null ? referent.getContentType() : null;
VirtualFile highlightFile = referent != null ? referent.getHighlightFile() : null;
DocumentContent content = createImpl(project, StringUtil.notNullize(text), type, highlightFile, null, true, false);
DocumentContent content = createImpl(project, StringUtil.notNullize(text), type, highlightFile, true, false);
content.putUserData(DiffUserDataKeysEx.FILE_NAME, "Clipboard.txt");
return content;
}
@@ -284,14 +283,13 @@ public class DiffContentFactoryImpl extends DiffContentFactoryEx {
@NotNull String text,
@Nullable FileType type,
@Nullable VirtualFile highlightFile,
@Nullable Charset charset,
boolean respectLineSeparators,
boolean readOnly) {
// TODO: detect invalid (different across the file) separators ?
LineSeparator separator = respectLineSeparators ? StringUtil.detectSeparators(text) : null;
Document document = EditorFactory.getInstance().createDocument(StringUtil.convertLineSeparators(text));
if (readOnly) document.setReadOnly(true);
return new DocumentContentImpl(document, type, highlightFile, separator, charset, null);
return new DocumentContentImpl(document, type, highlightFile, separator, null, null);
}
@NotNull