Skip to content

Commit

Permalink
Fixed IllegalArgumentException in ShowSettingsUtilImpl
Browse files Browse the repository at this point in the history
When trying to resolve dependencies without an Ivy settings file, an
IllegalArgumentException was thrown when clicking on the 'Open Project
Settings' link
  • Loading branch information
maartenc committed May 19, 2016
1 parent 70357da commit 0dad4f3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


<project name="IvyIDEA" default="bundle" basedir="."> <project name="IvyIDEA" default="bundle" basedir=".">


<property name="ivyidea.version" value="1.0.13"/> <property name="ivyidea.version" value="1.0.14"/>


<property name="ivyidea.sourcedir" value="src/main/java"/> <property name="ivyidea.sourcedir" value="src/main/java"/>
<property name="ivyidea.resourcedir" value="src/main/resources"/> <property name="ivyidea.resourcedir" value="src/main/resources"/>
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/META-INF/plugin.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
</description> </description>
<change-notes><![CDATA[ <change-notes><![CDATA[
<p> <p>
<strong>1.0.14</strong>
<ul>
<li>When trying to resolve dependencies without an Ivy settings file, an IllegalArgumentException
was thrown when clicking on the 'Open Project Settings' link</li>
</ul>
<strong>1.0.13</strong> <strong>1.0.13</strong>
<ul> <ul>
<li>The IvyIDEA settings window was no longer visible in IntelliJ 2016.1</li> <li>The IvyIDEA settings window was no longer visible in IntelliJ 2016.1</li>
Expand Down Expand Up @@ -113,7 +118,7 @@
</ul> </ul>
</p>]]> </p>]]>
</change-notes> </change-notes>
<version>1.0.13</version> <version>1.0.14</version>
<vendor email="guy.mahieu@gmail.com" url="http://www.clarent.org" logo="/ivyidea16.png">Guy Mahieu</vendor> <vendor email="guy.mahieu@gmail.com" url="http://www.clarent.org" logo="/ivyidea16.png">Guy Mahieu</vendor>
<idea-version since-build="3000"/> <idea-version since-build="3000"/>
<application-components> <application-components>
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@ private void showIvySettingsNotFoundErrorDialog(IvySettingsNotFoundException exc
"Open " + exception.getConfigLocation() + " settings for " + exception.getConfigName() + "...", "Open " + exception.getConfigLocation() + " settings for " + exception.getConfigName() + "...",
new LinkListener() { new LinkListener() {
public void linkSelected(LinkLabel linkLabel, Object o) { public void linkSelected(LinkLabel linkLabel, Object o) {
Configurable component = project.getComponent(IvyIdeaProjectSettingsComponent.class); ShowSettingsUtil.getInstance().showSettingsDialog(project, IvyIdeaProjectSettingsComponent.class);
ShowSettingsUtil.getInstance().editConfigurable(project, component);
} }
}, null); }, null);
} }
Expand Down

0 comments on commit 0dad4f3

Please sign in to comment.