diff --git a/pmd-jbuilder/copyfile.bat b/pmd-jbuilder/copyfile.bat index abca7c2028..26fe1bc171 100755 --- a/pmd-jbuilder/copyfile.bat +++ b/pmd-jbuilder/copyfile.bat @@ -1,2 +1,2 @@ -copy lib\PMDOpenTool.jar %1 -rem copy lib\pmd-dev.jar %1 \ No newline at end of file +copy lib\PMDOpenTool.jar c:\Jbuilder7\lib\ext +copy lib\PMDOpenTool.jar c:\Jbuilder4\lib\ext \ No newline at end of file diff --git a/pmd-jbuilder/lib/PMDOpenTool.jar b/pmd-jbuilder/lib/PMDOpenTool.jar index 14b7bdcfab..3f7d8e121a 100644 Binary files a/pmd-jbuilder/lib/PMDOpenTool.jar and b/pmd-jbuilder/lib/PMDOpenTool.jar differ diff --git a/pmd-jbuilder/src/images/Thumbs.db b/pmd-jbuilder/src/images/Thumbs.db new file mode 100644 index 0000000000..3599f1b012 --- /dev/null +++ b/pmd-jbuilder/src/images/Thumbs.db @@ -0,0 +1 @@ +ÐÏࡱ \ No newline at end of file diff --git a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java index 6dee504379..8db0b2f787 100644 --- a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java +++ b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java @@ -29,6 +29,7 @@ import com.borland.primetime.vfs.*; import com.borland.primetime.viewer.*; import net.sourceforge.pmd.*; import net.sourceforge.pmd.cpd.*; +import com.borland.jbcl.control.MessageDialog; @@ -58,7 +59,6 @@ public class PMDOpenTool { public static void initOpenTool (byte majorVersion, byte minorVersion) { if (majorVersion == PrimeTime.CURRENT_MAJOR_VERSION) { - GROUP_MENU_PMD.add(B_ACTION_PMDCheck); GROUP_MENU_PMD.add(B_ACTION_PMDProjectCheck); GROUP_MENU_PMD.add(B_ACTION_CPDProjectCheck); @@ -83,14 +83,18 @@ public class PMDOpenTool { CPDPropertyGroup cpdPropGrp = new CPDPropertyGroup(); //register the Keymap shortcuts if they are enabled - if (AcceleratorPropertyGroup.PROP_KEYS_ENABLED.getBoolean()) { - registerShortCuts(); + if (minorVersion > 1) { //accelerators don't seem to work in OpenTools 4.1 + if (AcceleratorPropertyGroup.PROP_KEYS_ENABLED.getBoolean()) { + registerShortCuts(); + } } PropertyManager.registerPropertyGroup(apropGrp); PropertyManager.registerPropertyGroup(cpropGrp); PropertyManager.registerPropertyGroup(ipropGrp); - PropertyManager.registerPropertyGroup(accpropGrp); + if (minorVersion > 1) { //accelerators don't seem to work in OpenTools 4.1 + PropertyManager.registerPropertyGroup(accpropGrp); + } PropertyManager.registerPropertyGroup(cpdPropGrp); }