2.4.0

Fixes #134 - plantuml 8051 Fixes #136 - NPE fix Fixes #131 - Changed default shortcuts to Ctrl+Alt+Shift+F and G
esteinberg · Dec 11, 2016 · 1ceca2b · 1ceca2b
1 parent cb320f2
commit 1ceca2b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <idea-plugin version="2">
     <name>PlantUML integration</name>
-    <version>2.3.1</version>
+    <version>2.4.0</version>
     <vendor>Eugene Steinberg</vendor>
     <!-- IJ 12+ -->
     <idea-version since-build="129.000"/>
@@ -9,6 +9,12 @@
 
     <change-notes>
         <![CDATA[
+            <p>2.4</p>
+            <ul>
+              <li>PlantUml library upgrade to 8051</li>
+              <li>Changed default shortcuts to Ctrl+Alt+Shift+F and G</li>
+              <li>NPE fix</li>
+            </ul>
             <p>2.3.1</p>
             <ul>
                 <li>Fixed ASCII image rendering and typos</li>
@@ -72,12 +78,12 @@
             <action id="PlantUML.Update" description="Update PlantUml Diagrams"
                     class="org.plantuml.idea.action.UpdateDiagramsAction"
                     icon="/javaee/updateRunningApplication.png" text="Update PlantUml Diagrams - changes only">
-                <keyboard-shortcut keymap="$default" first-keystroke="alt D"/>
+                <keyboard-shortcut keymap="$default" first-keystroke="ctrl alt shift F"/>
             </action>
             <action id="PlantUML.Reload" description="Reload PlantUml Diagrams"
                     class="org.plantuml.idea.action.ReloadNowAction"
                     icon="/actions/refresh.png" text="Reload PlantUml Diagrams">
-                <keyboard-shortcut keymap="$default" first-keystroke="alt F"/>
+                <keyboard-shortcut keymap="$default" first-keystroke="ctrl alt shift G"/>
             </action>
 
             <separator/>

diff --git a/lib/plantuml.8043.jar → lib/plantuml.8051.jar b/lib/plantuml.8043.jar → lib/plantuml.8051.jar
diff --git a/src/org/plantuml/idea/toolwindow/ExecutionStatusPanel.java b/src/org/plantuml/idea/toolwindow/ExecutionStatusPanel.java
@@ -142,8 +142,10 @@ public enum State {
 
         public void update(JLabel comp, String message) {
             ApplicationManager.getApplication().assertIsDispatchThread();
-            comp.setText(message);
-            comp.setForeground(this.color);
+            if (comp != null) { //strange NPE
+                comp.setText(message);
+                comp.setForeground(this.color);
+            }
         }
     }