Snapshot d8891a7de15cebb78b6ce5711e50e531b42c0baf from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: Ida9d1b0a2341112b9ebcf67bf560c8f62f0afdc6

4 files changed, 18 insertions, 10 deletions

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/CheckJavaHL.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/CheckJavaHL.java
index 7729902c7189..3c4f16fb8996 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/CheckJavaHL.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/CheckJavaHL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.jetbrains.idea.svn;
 
 import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationDisplayType;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
 import com.intellij.openapi.project.Project;
@@ -88,7 +89,7 @@ public class CheckJavaHL {
     if (! ourIsPresent) {
       Notifications.Bus.notify(new Notification(SvnVcs.getInstance(project).getDisplayName(), "Subversion: JavaHL problem",
                                                 ourProblemDescription + " Acceleration is not available.",
-                                                NotificationType.ERROR), project);
+                                                NotificationType.ERROR), NotificationDisplayType.STICKY_BALLOON, project);
     }
   }
 }
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
index d3c0fc124c7a..45fe521b35e9 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
@@ -83,7 +83,7 @@ message.text.error=Error
 
 # GNOME keyring dialog
 gnome.keyring.prompt.nameless=Please provide GNOME Keyring password
-gnome.keyring.prompt.named=Please provide ''{0}'' GNOME Keyring password
+gnome.keyring.prompt.named=Please provide '{0}' GNOME Keyring password
 
 #Repository Browser
 dialog.title.browser.copy.or.move=Copy or Move
@@ -212,7 +212,14 @@ radio.configure.create.auto.16format=1.&6 format
 radio.configure.create.auto.17format=1.&7 format
 
 label.configure.change.label=Change working copy ''{0}'' format to:
+radio.configure.change.none=1.&3 format
+radio.configure.change.auto=1.&4 format
+radio.configure.change.auto.15format=1.&5 format
+radio.configure.change.auto.16format=1.&6 format
+radio.configure.change.auto.17format=1.&7 format
 
+label.where.svn.format.settings.text=To change above setting later, visit '{0} | Version Control'
+label.where.svn.format.can.be.changed.text=''Version Control | Subversion | {0}''
 dialog.upgrade.wcopy.format.title=Subversion Working Copy Format
 
 label.working.copy.root.outside.text=Working copy root is outside the directory specified in Project Settings.\nThe whole working copy will be converted.
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java
index dc8cbb1cce8b..3d837368ed66 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2009 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -237,7 +237,7 @@ public class SvnChangeProvider implements ChangeProvider {
             continue;
           }
           final String childURL = childUrl.toDecodedString();
-          if (StringUtil.startsWithConcatenation(childURL, copyFromURL, "/")) {
+          if (StringUtil.startsWithConcatenationOf(childURL, copyFromURL, "/")) {
             String relativePath = childURL.substring(copyFromURL.length());
             File newPath = new File(copiedFile.getFilePath().getIOFile(), relativePath);
             FilePath newFilePath = myFactory.createFilePathOn(newPath);
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
index 748fc86c694c..4120dad1d7ec 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
@@ -461,14 +461,14 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
     if (SystemInfo.isWindows) {
       if (!SVNJNAUtil.isJNAPresent()) {
         Notifications.Bus.notify(new Notification(getDisplayName(), "Subversion plugin: no JNA",
-                                                  "A problem with JNA initialization for SVNKit library. Encryption is not available.",
-                                                  NotificationType.WARNING), myProject);
+                                                  "A problem with JNA initialization for svnkit library. Encryption is not available.",
+                                                  NotificationType.WARNING),
+                                 NotificationDisplayType.BALLOON, myProject);
       }
       else if (!SVNJNAUtil.isWinCryptEnabled()) {
         Notifications.Bus.notify(new Notification(getDisplayName(), "Subversion plugin: no encryption",
-                                                  "A problem with encryption module (Crypt32.dll) initialization for SVNKit library. " +
-                                                  "Encryption is not available.",
-                                                  NotificationType.WARNING), myProject);
+                                                  "A problem with encryption module (Crypt32.dll) initialization for svnkit library. Encryption is not available.",
+                                                  NotificationType.WARNING), NotificationDisplayType.BALLOON, myProject);
       }
     }