Fixes #101 Moving bundle to proper location

Author: amitdev

.gitignore

@@ -1,2 +1,4 @@
 .idea/
 out/
+.gradle
+build

CHANGELOG.md

@@ -3,6 +3,9 @@
 # PMDPlugin Changelog
 
 ## [Unreleased]
+### Changed
+- Fixed #101: bundle loading error during vcs commit
+
 ## [1.8.20]
 ### Added
 - Update to PMD version 6.38.0

gradle.properties

@@ -3,7 +3,7 @@
 
 # pluginGroup = com.intellij.plugins.bodhi.pmd
 pluginName = PMDPlugin
-pluginVersion = 1.8.20
+pluginVersion = 1.8.21
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

src/main/java/com/intellij/plugins/bodhi/pmd/handlers/PMDCheckinHandler.java

@@ -1,5 +1,6 @@
 package com.intellij.plugins.bodhi.pmd.handlers;
 
+import com.intellij.AbstractBundle;
 import com.intellij.CommonBundle;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
@@ -37,7 +38,7 @@
 public class PMDCheckinHandler extends CheckinHandler {
 
     private static final Log log = LogFactory.getLog(PMDCheckinHandler.class);
-    private static final String BUNDLE = "com.intellij.plugins.bodhi.pmd.PMD-Intellij";
+    private static final String BUNDLE = "messages.PMD-Intellij";
 
     @NonNls
     private final CheckinProjectPanel checkinProjectPanel;
@@ -81,17 +82,13 @@ public void restoreState() {
 
     @NotNull
     private String message(@PropertyKey(resourceBundle = BUNDLE) String key, Object... params) {
-        return CommonBundle.message(ResourceBundle.getBundle(BUNDLE), key, params);
+        return AbstractBundle.message(ResourceBundle.getBundle(BUNDLE), key, params);
     }
 
     @Override
     public ReturnResult beforeCheckin(@Nullable CommitExecutor executor,
                                       PairConsumer<Object, Object> additionalDataConsumer) {
         Project project = checkinProjectPanel.getProject();
-        if (project == null) {
-            log.error("Could not get project for check-in panel, skipping");
-            return ReturnResult.COMMIT;
-        }
 
         PMDProjectComponent plugin = project.getComponent(PMDProjectComponent.class);
         if (plugin == null) {
@@ -180,7 +177,9 @@ private void showToolWindow(List<PMDBranchNode> ruleSetResultNodes, Project proj
             resultPanel.addNode(rootNode, ruleSetNode);
         }
         ToolWindow toolWindow = ToolWindowManager.getInstance(project).getToolWindow(PMDProjectComponent.TOOL_ID);
-        toolWindow.activate(null);
+        if (toolWindow != null) {
+            toolWindow.activate(null);
+        }
         plugin.setLastRunActionAndRules(null, StringUtils.join(plugin.getCustomRuleSetPaths(), PMDInvoker.RULE_DELIMITER), true);
     }
 }