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: cleanup

Browse Source 
* @NotNull
* remove redundant generic
* use util method to delete temp file
* merge `if` branches with the same body
This commit is contained in:
Aleksey Pivovarov
2016-02-26 14:03:09 +03:00
parent 26657c674f
commit 96c3fec4bb
8 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class DiffIterableUtil {
* Compare two integer arrays
*/
@NotNull
public static <T> FairDiffIterable diff(@NotNull int[] data1, @NotNull int[] data2, @NotNull ProgressIndicator indicator) {
public static FairDiffIterable diff(@NotNull int[] data1, @NotNull int[] data2, @NotNull ProgressIndicator indicator) {
indicator.checkCanceled();
try {
platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
+1 -1
View File
@@ -1421,7 +1421,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
}
private static class MyUndoableAction extends BasicUndoableAction {
private final WeakReference<TextMergeViewer> myViewerRef;
@NotNull private final WeakReference<TextMergeViewer> myViewerRef;
@NotNull private final List<TextMergeChange.State> myStates;
private final boolean myUndo;
platform/diff-impl/src/com/intellij/diff/tools/binary/OnesideBinaryDiffViewer.java
+1 -1
View File
@@ -39,7 +39,7 @@ import static java.util.Collections.singletonList;
public class OnesideBinaryDiffViewer extends OnesideDiffViewer<BinaryEditorHolder> {
public static final Logger LOG = Logger.getInstance(OnesideBinaryDiffViewer.class);
private final TransferableFileEditorStateSupport myTransferableStateSupport;
@NotNull private final TransferableFileEditorStateSupport myTransferableStateSupport;
public OnesideBinaryDiffViewer(@NotNull DiffContext context, @NotNull DiffRequest request) {
super(context, (ContentDiffRequest)request, BinaryEditorHolder.BinaryEditorHolderFactory.INSTANCE);
platform/diff-impl/src/com/intellij/diff/tools/binary/ThreesideBinaryDiffViewer.java
+1 -1
View File
@@ -32,7 +32,7 @@ import java.util.List;
import static com.intellij.diff.util.DiffUtil.getDiffSettings;
public class ThreesideBinaryDiffViewer extends ThreesideDiffViewer<BinaryEditorHolder> {
private final TransferableFileEditorStateSupport myTransferableStateSupport;
@NotNull private final TransferableFileEditorStateSupport myTransferableStateSupport;
public ThreesideBinaryDiffViewer(@NotNull DiffContext context, @NotNull DiffRequest request) {
super(context, (ContentDiffRequest)request, BinaryEditorHolder.BinaryEditorHolderFactory.INSTANCE);
platform/diff-impl/src/com/intellij/diff/tools/binary/TwosideBinaryDiffViewer.java
+1 -1
View File
@@ -57,7 +57,7 @@ import static com.intellij.diff.util.DiffUtil.getDiffSettings;
public class TwosideBinaryDiffViewer extends TwosideDiffViewer<BinaryEditorHolder> {
public static final Logger LOG = Logger.getInstance(TwosideBinaryDiffViewer.class);
private final TransferableFileEditorStateSupport myTransferableStateSupport;
@NotNull private final TransferableFileEditorStateSupport myTransferableStateSupport;
@NotNull private final StatusPanel myStatusPanel;
public TwosideBinaryDiffViewer(@NotNull DiffContext context, @NotNull DiffRequest request) {
platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java
Vendored
+1 -1
View File
@@ -430,7 +430,7 @@ public class ExternalDiffToolUtil {
@Override
public void cleanup() {
myLocalFile.delete();
FileUtil.delete(myLocalFile);
}
}
}
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java
+1 -10
View File
@@ -239,20 +239,11 @@ public class SimpleDiffChange {
public GutterIconRenderer createRenderer() {
myCtrlPressed = myViewer.getModifierProvider().isCtrlPressed();
boolean isEditable = DiffUtil.isEditable(myViewer.getEditor(mySide));
boolean isOtherEditable = DiffUtil.isEditable(myViewer.getEditor(mySide.other()));
boolean isAppendable = myFragment.getStartLine1() != myFragment.getEndLine1() &&
myFragment.getStartLine2() != myFragment.getEndLine2();
if (isOtherEditable && isEditable) {
if (myCtrlPressed && isAppendable) {
return createAppendRenderer(mySide);
}
else {
return createApplyRenderer(mySide);
}
}
else if (isOtherEditable) {
if (isOtherEditable) {
if (myCtrlPressed && isAppendable) {
return createAppendRenderer(mySide);
}
platform/util/src/com/intellij/util/diff/Diff.java
+9 -9
View File
@@ -80,7 +80,7 @@ public class Diff {
}
@Nullable
public static <T> Change buildChanges(@NotNull int[] array1, @NotNull int[] array2) throws FilesTooBigForDiffException {
public static Change buildChanges(@NotNull int[] array1, @NotNull int[] array2) throws FilesTooBigForDiffException {
final int startShift = getStartShift(array1, array2);
final int endCut = getEndCut(array1, array2, startShift);
@@ -140,28 +140,28 @@ public class Diff {
return builder.getFirstChange();
}
private static <T> int getStartShift(final T[] o1, final T[] o2) {
private static <T> int getStartShift(@NotNull final T[] o1, @NotNull final T[] o2) {
final int size = Math.min(o1.length, o2.length);
int idx = 0;
for (int i = 0; i < size; i++) {
if (! o1[i].equals(o2[i])) break;
++ idx;
if (!o1[i].equals(o2[i])) break;
++idx;
}
return idx;
}
private static <T> int getEndCut(final T[] o1, final T[] o2, final int startShift) {
private static <T> int getEndCut(@NotNull final T[] o1, @NotNull final T[] o2, int startShift) {
final int size = Math.min(o1.length, o2.length) - startShift;
int idx = 0;
for (int i = 0; i < size; i++) {
if (! o1[o1.length - i - 1].equals(o2[o2.length - i - 1])) break;
++ idx;
if (!o1[o1.length - i - 1].equals(o2[o2.length - i - 1])) break;
++idx;
}
return idx;
}
private static int getStartShift(final int[] o1, final int[] o2) {
private static int getStartShift(@NotNull final int[] o1, @NotNull final int[] o2) {
final int size = Math.min(o1.length, o2.length);
int idx = 0;
for (int i = 0; i < size; i++) {
@@ -171,7 +171,7 @@ public class Diff {
return idx;
}
private static int getEndCut(final int[] o1, final int[] o2, final int startShift) {
private static int getEndCut(@NotNull final int[] o1, @NotNull final int[] o2, final int startShift) {
final int size = Math.min(o1.length, o2.length) - startShift;
int idx = 0;