Merge branch 'master' into develar/pwd

lada-gagina · Jul 26, 2016 · 2e886ac · 2e886ac
2 parents d451248 + d59d320
commit 2e886ac
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 25 deletions.
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemeImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemeImpl.java
@@ -18,7 +18,7 @@
 import com.intellij.configurationStore.SchemeDataHolder;
 import com.intellij.configurationStore.SerializableScheme;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.options.ExternalizableScheme;
+import com.intellij.openapi.options.ExternalizableSchemeAdapter;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.psi.codeStyle.CodeStyleScheme;
@@ -27,9 +27,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class CodeStyleSchemeImpl implements CodeStyleScheme, ExternalizableScheme, SerializableScheme {
-  private String myName;
-
+public class CodeStyleSchemeImpl extends ExternalizableSchemeAdapter implements CodeStyleScheme, SerializableScheme {
   private static final Logger LOG = Logger.getInstance(CodeStyleSchemeImpl.class);
 
   private SchemeDataHolder<? super CodeStyleSchemeImpl> myDataHolder;
@@ -50,17 +48,6 @@ public CodeStyleSchemeImpl(@NotNull String name, boolean isDefault, CodeStyleSch
     init(parentScheme, null);
   }
 
-  @NotNull
-  @Override
-  public String getName() {
-    return myName;
-  }
-
-  @Override
-  public void setName(@NotNull String value) {
-    myName = value;
-  }
-
   private void init(@Nullable CodeStyleScheme parentScheme, Element root) {
     if (parentScheme == null) {
       myCodeStyleSettings = new CodeStyleSettings();

diff --git a/plugins/settings-repository/lib/jackson-annotations-2.7.1.jar b/plugins/settings-repository/lib/jackson-annotations-2.7.1.jar
diff --git a/...lib/jackson-annotations-2.7.1-sources.jar → ...lib/jackson-annotations-2.8.1-sources.jar b/...lib/jackson-annotations-2.7.1-sources.jar → ...lib/jackson-annotations-2.8.1-sources.jar
diff --git a/plugins/settings-repository/lib/jackson-annotations-2.8.1.jar b/plugins/settings-repository/lib/jackson-annotations-2.8.1.jar
diff --git a/plugins/settings-repository/lib/jackson-core-2.7.1-sources.jar b/plugins/settings-repository/lib/jackson-core-2.7.1-sources.jar
diff --git a/plugins/settings-repository/lib/jackson-core-2.7.1.jar b/plugins/settings-repository/lib/jackson-core-2.7.1.jar
diff --git a/plugins/settings-repository/lib/jackson-core-2.8.1-sources.jar b/plugins/settings-repository/lib/jackson-core-2.8.1-sources.jar
diff --git a/plugins/settings-repository/lib/jackson-core-2.8.1.jar b/plugins/settings-repository/lib/jackson-core-2.8.1.jar
diff --git a/plugins/settings-repository/lib/jackson-databind-2.7.1-1-sources.jar b/plugins/settings-repository/lib/jackson-databind-2.7.1-1-sources.jar
diff --git a/plugins/settings-repository/lib/jackson-databind-2.7.1-1.jar b/plugins/settings-repository/lib/jackson-databind-2.7.1-1.jar
diff --git a/plugins/settings-repository/lib/jackson-databind-2.8.1-sources.jar b/plugins/settings-repository/lib/jackson-databind-2.8.1-sources.jar
diff --git a/plugins/settings-repository/lib/jackson-databind-2.8.1.jar b/plugins/settings-repository/lib/jackson-databind-2.8.1.jar
diff --git a/plugins/settings-repository/settings-repository.iml b/plugins/settings-repository/settings-repository.iml
@@ -36,15 +36,15 @@
           <root url="file://$MODULE_DIR$/lib" />
         </ANNOTATIONS>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jackson-annotations-2.7.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/jackson-core-2.7.1.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/jackson-databind-2.7.1-1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jackson-annotations-2.8.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jackson-core-2.8.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jackson-databind-2.8.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/lib/jackson-annotations-2.7.1-sources.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/jackson-core-2.7.1-sources.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/jackson-databind-2.7.1-1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jackson-annotations-2.8.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jackson-core-2.8.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/jackson-databind-2.8.1-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

diff --git a/plugins/settings-repository/src/org/jetbrains/settingsRepository/CommitToIcsDialog.java b/plugins/settings-repository/src/org/jetbrains/settingsRepository/CommitToIcsDialog.java
@@ -22,7 +22,6 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.ChangeList;
 import com.intellij.openapi.vcs.changes.ui.ChangesBrowser;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.SmartList;
@@ -43,7 +42,7 @@ public CommitToIcsDialog(Project project, String projectId, List<Change> project
     this.project = project;
     this.projectId = projectId;
 
-    browser = new ChangesBrowser(project, Collections.<ChangeList>emptyList(), projectFileChanges, null, true, false, null, ChangesBrowser.MyUseCase.LOCAL_CHANGES, null);
+    browser = new ChangesBrowser(project, Collections.emptyList(), projectFileChanges, null, true, false, null, ChangesBrowser.MyUseCase.LOCAL_CHANGES, null);
     browser.setChangesToDisplay(projectFileChanges);
 
     setTitle(IcsBundleKt.icsMessage("action.CommitToIcs.text"));

diff --git a/plugins/settings-repository/src/settings/IcsConfigurable.kt b/plugins/settings-repository/src/settings/IcsConfigurable.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 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.
@@ -47,5 +47,5 @@ class IcsConfigurableUi : ConfigurableUi<IcsSettings> {
     saveSettings(settings, icsManager.settingsFile)
   }
 
-  override fun getComponent() = panel.rootPanel
+  override fun getComponent() = panel.rootPanel!!
 }