diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /updater | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'updater')
| -rwxr-xr-x | updater/src/com/intellij/updater/Runner.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/updater/src/com/intellij/updater/Runner.java b/updater/src/com/intellij/updater/Runner.java index d0143a946b0c..56a331b5ebc8 100755 --- a/updater/src/com/intellij/updater/Runner.java +++ b/updater/src/com/intellij/updater/Runner.java @@ -175,8 +175,8 @@ public class Runner { optionalFiles, ui); - logger.info("Packing jar file: " + outPatchJar ); - ui.startProcess("Packing jar file '" + outPatchJar + "'..."); + logger.info("Packing JAR file: " + outPatchJar ); + ui.startProcess("Packing JAR file '" + outPatchJar + "'..."); FileOutputStream fileOut = new FileOutputStream(outPatchJar); try { @@ -326,8 +326,8 @@ public class Runner { private static File resolveJarFile() throws IOException { URL url = Runner.class.getResource(""); - if (url == null) throw new IOException("Cannot resolve jar file path"); - if (!"jar".equals(url.getProtocol())) throw new IOException("Patch file is not a 'jar' file"); + if (url == null) throw new IOException("Cannot resolve JAR file path"); + if (!"jar".equals(url.getProtocol())) throw new IOException("Patch file is not a JAR file"); String path = url.getPath(); |