Merge branch 'master' into master2

mallowigi · mallowigi · commit ef0157794851 · 2017-07-10T21:13:01.000+03:00
# Conflicts:
#	src/main/resources/META-INF/plugin.xml
diff --git a/Material Theme.zip b/Material Theme.zip
diff --git a/src/main/java/com/chrisrm/idea/MTConfig.java b/src/main/java/com/chrisrm/idea/MTConfig.java
@@ -117,6 +117,26 @@ public void loadState(MTConfig state) {
     XmlSerializerUtil.copyBean(state, this);
   }
 
+  /**
+   * Fire an event to the application bus that the settings have changed
+   *
+   * @param form
+   */
+  public void fireBeforeChanged(MTForm form) {
+    ApplicationManager.getApplication().getMessageBus()
+                      .syncPublisher(BeforeConfigNotifier.BEFORE_CONFIG_TOPIC)
+                      .beforeConfigChanged(this, form);
+  }
+
+  /**
+   * Fire an event to the application bus that the settings have changed
+   */
+  public void fireChanged() {
+    ApplicationManager.getApplication().getMessageBus()
+                      .syncPublisher(ConfigNotifier.CONFIG_TOPIC)
+                      .configChanged(this);
+  }
+
   /**
    * Get the set highlight color
    *
@@ -240,26 +260,6 @@ public boolean isBoldTabsChanged(boolean isBoldTabs) {
     return this.isBoldTabs != isBoldTabs;
   }
 
-  /**
-   * Fire an event to the application bus that the settings have changed
-   *
-   * @param form
-   */
-  public void fireBeforeChanged(MTForm form) {
-    ApplicationManager.getApplication().getMessageBus()
-        .syncPublisher(BeforeConfigNotifier.BEFORE_CONFIG_TOPIC)
-        .beforeConfigChanged(this, form);
-  }
-
-  /**
-   * Fire an event to the application bus that the settings have changed
-   */
-  public void fireChanged() {
-    ApplicationManager.getApplication().getMessageBus()
-        .syncPublisher(ConfigNotifier.CONFIG_TOPIC)
-        .configChanged(this);
-  }
-
   public boolean getIsBoldTabs() {
     return isBoldTabs;
   }
diff --git a/src/main/java/com/chrisrm/idea/MTTheme.java b/src/main/java/com/chrisrm/idea/MTTheme.java
@@ -72,6 +72,7 @@ public Color getDisabledColor() {
     return ColorUtil.fromHex(properties.getProperty("material.disabled"));
   }
 
+  @NotNull
   public String getEditorColorsScheme() {
     return editorColorsScheme;
   }
diff --git a/src/main/java/com/chrisrm/idea/themes/MTLafComponent.java b/src/main/java/com/chrisrm/idea/themes/MTLafComponent.java
@@ -7,7 +7,6 @@
 import com.chrisrm.idea.messages.MaterialThemeBundle;
 import com.chrisrm.idea.ui.*;
 import com.chrisrm.idea.utils.UIReplacer;
-import com.intellij.ide.AppLifecycleListener;
 import com.intellij.ide.ui.LafManager;
 import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
 import com.intellij.openapi.application.Application;
@@ -16,6 +15,8 @@
 import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.project.ProjectManagerListener;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.impl.status.IdeStatusBarImpl;
@@ -59,7 +60,6 @@ public void initComponent() {
     connect = ApplicationManager.getApplication().getMessageBus().connect();
     connect.subscribe(ConfigNotifier.CONFIG_TOPIC, this::onSettingsChanged);
     connect.subscribe(BeforeConfigNotifier.BEFORE_CONFIG_TOPIC, (this::onBeforeSettingsChanged));
-
   }
 
   /**
@@ -72,18 +72,20 @@ public static void hackTitleLabel() {
       ClassPool cp = new ClassPool(true);
       cp.insertClassPath(new ClassClassPath(CaptionPanel.class));
       CtClass ctClass = cp.get("com.intellij.ui.TitlePanel");
-      CtConstructor declaredConstructor = ctClass.getDeclaredConstructor(new CtClass[]{cp.get("javax.swing.Icon"), cp.get("javax.swing" +
-          ".Icon")});
+      CtConstructor declaredConstructor = ctClass.getDeclaredConstructor(new CtClass[] {cp.get("javax.swing.Icon"), cp.get("javax.swing" +
+                                                                                                                           ".Icon")});
       declaredConstructor.instrument(new ExprEditor() {
         @Override
         public void edit(MethodCall m) throws CannotCompileException {
           if (m.getMethodName().equals("empty")) {
             // Replace insets
             m.replace("{ $1 = 10; $2 = 10; $3 = 10; $4 = 10; $_ = $proceed($$); }");
-          } else if (m.getMethodName().equals("setHorizontalAlignment")) {
+          }
+          else if (m.getMethodName().equals("setHorizontalAlignment")) {
             // Set title at the left
             m.replace("{ $1 = javax.swing.SwingConstants.LEFT; $_ = $proceed($$); }");
-          } else if (m.getMethodName().equals("setBorder")) {
+          }
+          else if (m.getMethodName().equals("setBorder")) {
             // Bigger heading
             m.replace("{ $_ = $proceed($$); myLabel.setFont(myLabel.getFont().deriveFont(1, com.intellij.util.ui.JBUI.scale(16.0f))); }");
           }
@@ -96,7 +98,6 @@ public void edit(MethodCall m) throws CannotCompileException {
     }
   }
 
-
   @Override
   public void disposeComponent() {
     connect.disconnect();
@@ -163,7 +164,8 @@ private void restartIde() {
     Application application = ApplicationManager.getApplication();
     if (application instanceof ApplicationImpl) {
       ((ApplicationImpl) application).restart(true);
-    } else {
+    }
+    else {
       application.restart();
     }
   }
@@ -178,7 +180,7 @@ private static void hackSearchTextField() throws NotFoundException, CannotCompil
 
     CtClass darculaClass = cp.get("com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI");
     CtClass componentClass = cp.get("javax.swing.JComponent");
-    CtMethod createUI = darculaClass.getDeclaredMethod("createUI", new CtClass[]{componentClass});
+    CtMethod createUI = darculaClass.getDeclaredMethod("createUI", new CtClass[] {componentClass});
     createUI.setBody("{ return com.chrisrm.idea.ui.MTTextFieldFactory.newInstance($1); }");
     darculaClass.toClass();
   }
@@ -248,9 +250,10 @@ private void replaceStatusBar() {
     MessageBusConnection connect = ApplicationManager.getApplication().getMessageBus().connect();
 
     // On app init, set the statusbar borders
-    connect.subscribe(AppLifecycleListener.TOPIC, new AppLifecycleListener() {
+    connect.subscribe(ProjectManager.TOPIC, new ProjectManagerListener() {
+
       @Override
-      public void appStarting(@Nullable Project projectFromCommandLine) {
+      public void projectOpened(@Nullable Project projectFromCommandLine) {
         boolean compactSidebar = MTConfig.getInstance().isCompactStatusBar();
         setStatusBarBorders(compactSidebar);
       }
@@ -261,7 +264,6 @@ public void appStarting(@Nullable Project projectFromCommandLine) {
       boolean compactSidebar = mtConfig.isCompactStatusBar();
       setStatusBarBorders(compactSidebar);
     });
-
   }
 
   private void setStatusBarBorders(boolean compactSidebar) {
diff --git a/src/main/java/com/chrisrm/idea/themes/MTThemeManager.java b/src/main/java/com/chrisrm/idea/themes/MTThemeManager.java
@@ -150,6 +150,10 @@ public void activate() {
    * @param mtTheme
    */
   public void activate(MTTheme mtTheme) {
+    if (mtTheme == null) {
+      mtTheme = MTTheme.DEFAULT;
+    }
+
     MTConfig.getInstance().setSelectedTheme(mtTheme);
 
     try {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.chrisrm.idea.MaterialThemeUI</id>
     <name>Material Theme UI</name>
-    <version>0.5.3.2</version>
+    <version>0.5.3.4</version>
     <vendor email="chris@hirvi.no" url="https://hirvi.no">Hirvi AS</vendor>
 
     <description><![CDATA[

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public Color getDisabledColor() {`
`72`	`72`	`return ColorUtil.fromHex(properties.getProperty("material.disabled"));`
`73`	`73`	`}`
`74`	`74`
	`75`	`+ @NotNull`
`75`	`76`	`public String getEditorColorsScheme() {`
`76`	`77`	`return editorColorsScheme;`
`77`	`78`	`}`