Skip to content
This repository has been archived by the owner on Aug 26, 2021. It is now read-only.

Fix for Android Studio 2.2 #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for Android Studio 2.2 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
304d4bb
Fix for Android Studio 2.2
m4fi3ux Jun 8, 2016
5386031
Fix for Android Studio 2.2 (Build with IC-145.1617.8)
m4fi3ux Jun 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions otto-intellij-plugin.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="IDEA IC-141.1532.4" jdkType="IDEA JDK" />
<orderEntry type="jdk" jdkName="IntelliJ IDEA Community Edition IC-145.1617.8" jdkType="IDEA JDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

</module>
Binary file modified otto-intellij-plugin.jar
View file
Open in desktop
Binary file not shown.
5 changes: 2 additions & 3 deletions src/com/squareup/ideaplugin/otto/ShowUsagesAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@
import com.intellij.psi.search.SearchScope;
import com.intellij.ui.ActiveComponent;
import com.intellij.ui.InplaceButton;
import com.intellij.ui.JBTableWithHintProvider;
import com.intellij.ui.ScreenUtil;
import com.intellij.ui.SpeedSearchBase;
import com.intellij.ui.SpeedSearchComparator;
import com.intellij.ui.TableScrollingUtil;
import com.intellij.ui.TableUtil;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.ui.popup.AbstractPopup;
import com.intellij.ui.table.JBTable;
import com.intellij.usageView.UsageViewBundle;
import com.intellij.usages.PsiElementUsageTarget;
import com.intellij.usages.Usage;
Expand Down Expand Up @@ -1114,7 +1114,7 @@ private static Editor getEditorFor(@NotNull Usage usage) {
return newFileEditor instanceof TextEditor ? ((TextEditor)newFileEditor).getEditor() : null;
}

private static class MyTable extends JBTableWithHintProvider implements DataProvider {
private static class MyTable extends JBTable implements DataProvider {
@Override
public boolean getScrollableTracksViewportWidth() {
return true;
Expand All @@ -1131,7 +1131,6 @@ public Object getData(@NonNls String dataId) {
return null;
}

@Override
@Nullable
protected PsiElement getPsiElementForHint(Object selectedValue) {
if (selectedValue instanceof UsageNode) {
Expand Down