Skip to content

Commit 51b1157

Browse files
committed
Due to no support for JDK 1.7 on OSX, plugins must target and be built with 1.6.
1 parent a670f43 commit 51b1157

13 files changed

+140
-124
lines changed

src/ServiceStackIDEA/.idea/libraries/maven_model_3_3_1.xml renamed to src/ServiceStackIDEA/.idea/libraries/maven_model_3_0_5.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStackIDEA/.idea/libraries/plexus_utils_3_0_20.xml renamed to src/ServiceStackIDEA/.idea/libraries/plexus_utils_2_0_6.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStackIDEA/.idea/workspace.xml

Lines changed: 119 additions & 101 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ServiceStackIDEA/ServiceStackIDEA.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="library" exported="" name="com.google.code.gson:gson:2.3.1" level="project" />
1212
<orderEntry type="library" exported="" name="org.apache.httpcomponents:com.springsource.org.apache.httpcomponents.httpclient:4.2" level="project" />
13-
<orderEntry type="library" exported="" name="plexus-utils-3.0.20" level="project" />
14-
<orderEntry type="library" exported="" name="maven-model-3.3.1" level="project" />
13+
<orderEntry type="library" exported="" name="maven-model-3.0.5" level="project" />
14+
<orderEntry type="library" exported="" name="plexus-utils-2.0.6" level="project" />
1515
</component>
1616
</module>
-15.1 KB
Binary file not shown.
160 KB
Binary file not shown.
-157 KB
Binary file not shown.
218 KB
Binary file not shown.
-237 KB
Binary file not shown.

src/ServiceStackIDEA/src/net/servicestack/idea/AddServiceStackRefHandler.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package net.servicestack.idea;
22

3-
import com.intellij.ide.util.PackageChooserDialog;
43
import com.intellij.notification.Notification;
54
import com.intellij.notification.NotificationType;
65
import com.intellij.notification.Notifications;
@@ -9,8 +8,6 @@
98
import com.intellij.openapi.fileEditor.FileDocumentManager;
109
import com.intellij.openapi.fileEditor.FileEditorManager;
1110
import com.intellij.openapi.module.Module;
12-
import com.intellij.openapi.project.Project;
13-
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
1411
import com.intellij.openapi.vfs.LocalFileSystem;
1512
import com.intellij.openapi.vfs.VirtualFile;
1613
import com.intellij.openapi.vfs.VirtualFileManager;
@@ -28,7 +25,6 @@
2825
import java.net.URLConnection;
2926
import java.util.ArrayList;
3027
import java.util.List;
31-
import java.util.Objects;
3228

3329
/**
3430
* Created by Layoric on 14/05/2015.
@@ -143,6 +139,12 @@ private static boolean tryAddMavenDependency(Module module) {
143139
showDto = pomFileHelper.addMavenDependencyIfRequired(pomLibFile, dependencyGroupId, clientPackageId, dependencyVersion);
144140
} catch(Exception e) {
145141
showDto = false;
142+
e.printStackTrace();
143+
notification = new Notification(
144+
"ServiceStackIDEA",
145+
"Warning Add ServiceStack Reference",
146+
"Unable to add maven dependency. " + e.getLocalizedMessage(),
147+
NotificationType.WARNING);
146148
Notifications.Bus.notify(notification);
147149
}
148150
return showDto;
@@ -275,7 +277,7 @@ private static URIBuilder createUrl(String text) throws MalformedURLException, U
275277
private static String getDtoFileName(String name) {
276278
int p = name.lastIndexOf(".");
277279
String e = name.substring(p + 1);
278-
if (p == -1 || !Objects.equals(e, "java")) {
280+
if (p == -1 || !e.equals("java")) {
279281
/* file has no extension */
280282
return name + ".java";
281283
} else {
@@ -287,7 +289,7 @@ private static String getDtoFileName(String name) {
287289
private static String getDtoNameWithoutExtension(String name) {
288290
int p = name.lastIndexOf(".");
289291
String e = name.substring(p + 1);
290-
if (p == -1 || !Objects.equals(e, "java")) {
292+
if (p == -1 || !e.equals("java")) {
291293
/* file has no extension */
292294
return name;
293295
} else {

0 commit comments

Comments
 (0)