From 72620cd99c672e92eb0d4c4fd48355a0a3cc490f Mon Sep 17 00:00:00 2001 From: Torsten Kleiber Date: Tue, 6 Nov 2007 22:40:43 +0000 Subject: [PATCH] Release 1.9.0.0.1 for JDeveloper 11g Developer Preview 2 git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@5633 51baf565-9d33-0410-a72c-fc3788e3496d --- pmd-jdeveloper.11.1.1/etc/build.xml | 19 ++++---- pmd-jdeveloper.11.1.1/etc/bundle.xml | 24 ++++------- pmd-jdeveloper.11.1.1/etc/center.xml | 16 ++++++- pmd-jdeveloper.11.1.1/etc/changelog.txt | 5 ++- .../doing_the_next_pmd_jdeveloper_release.txt | 10 ++--- pmd-jdeveloper.11.1.1/etc/extension.xml | 43 +++++++++---------- pmd-jdeveloper.11.1.1/pmd-jdeveloper1111.jpr | 29 ++----------- .../sourceforge/pmd/jdeveloper/Plugin.java | 21 ++++----- 8 files changed, 78 insertions(+), 89 deletions(-) diff --git a/pmd-jdeveloper.11.1.1/etc/build.xml b/pmd-jdeveloper.11.1.1/etc/build.xml index fffc3cd23b..1df0d7fad2 100644 --- a/pmd-jdeveloper.11.1.1/etc/build.xml +++ b/pmd-jdeveloper.11.1.1/etc/build.xml @@ -1,18 +1,18 @@ - + - + - + - - - + + + @@ -27,9 +27,10 @@ - - - + + + + diff --git a/pmd-jdeveloper.11.1.1/etc/bundle.xml b/pmd-jdeveloper.11.1.1/etc/bundle.xml index 2c0b5c0296..cffc1bd938 100644 --- a/pmd-jdeveloper.11.1.1/etc/bundle.xml +++ b/pmd-jdeveloper.11.1.1/etc/bundle.xml @@ -1,16 +1,10 @@ - - - - PMD JDeveloper Extension - 1.9 - Torsten Kleiber - http://pmd.sourceforge.net/ - Provides integrated support for PMD 4.0 in JDeveloper 10.1.3 - 11.1.1. - - - - + + + + PMD JDeveloper Extension + 1.9.0.0.1 + Torsten Kleiber + http://pmd.sourceforge.net/ + Provides integrated support for PMD 4.0 in JDeveloper 11g Technology Preview 2. + diff --git a/pmd-jdeveloper.11.1.1/etc/center.xml b/pmd-jdeveloper.11.1.1/etc/center.xml index 799c9638b7..74c3310741 100644 --- a/pmd-jdeveloper.11.1.1/etc/center.xml +++ b/pmd-jdeveloper.11.1.1/etc/center.xml @@ -6,7 +6,21 @@ 1.9 Torsten Kleiber http://pmd.sourceforge.net - Provides integrated support for PMD 4.0 in JDeveloper 10.1.3 - 11.1.1. + Provides integrated support for PMD 4.0 in JDeveloper 10.1.3. - 11g Technology Preview 1. http://pmd.sourceforge.net/pmd-jdeveloper1013-1.9.zip + + + + + + PMD JDeveloper Extension + 1.9.0.0.1 + Torsten Kleiber + http://pmd.sourceforge.net + Provides integrated support for PMD 4.0 in JDeveloper 11g Technology Preview 2. + http://pmd.sourceforge.net/pmd-jdeveloper1111-1.9.0.0.1.zip + + + \ No newline at end of file diff --git a/pmd-jdeveloper.11.1.1/etc/changelog.txt b/pmd-jdeveloper.11.1.1/etc/changelog.txt index 7ec2282378..968bdc87e4 100644 --- a/pmd-jdeveloper.11.1.1/etc/changelog.txt +++ b/pmd-jdeveloper.11.1.1/etc/changelog.txt @@ -1,6 +1,9 @@ +November 06, 2007 - 1.9.0.0.1: +Upgraded for use in JDeveloper 11.1.1 Developer Preview 2 + August 06, 2007 - 1.9: Upgraded to PMD 4.0 -Upgraded for use in JDeveloper 10.1.3 to 11.1.1 +Upgraded for use in JDeveloper 10.1.3 to 11.1.1 Developer Preview 1 January 30, 2005 - 1.8: Better presentation of the rule violations. diff --git a/pmd-jdeveloper.11.1.1/etc/doing_the_next_pmd_jdeveloper_release.txt b/pmd-jdeveloper.11.1.1/etc/doing_the_next_pmd_jdeveloper_release.txt index e8ebfa4bf5..faa96f022a 100644 --- a/pmd-jdeveloper.11.1.1/etc/doing_the_next_pmd_jdeveloper_release.txt +++ b/pmd-jdeveloper.11.1.1/etc/doing_the_next_pmd_jdeveloper_release.txt @@ -1,4 +1,4 @@ -change the build.xml, bundle.xml, center.xml to reflect pmd-jdeveloper1013 release +change the build.xml, bundle.xml, center.xml to reflect pmd-jdeveloper1111 release update the release date in the changelog Update Plugin.version() to reflect release @@ -22,15 +22,15 @@ src release: // TODO automation by ant, if subversion tasks are available checkin // TODO automation by ant, if subversion tasks are available -copy to tags/pmd-jdeveloper/pmd_jdeveloper1013_release_X_X +copy to tags/pmd-jdeveloper/pmd_jdeveloper1111_release_X_X ant releasesrc release on website: ant upload Go to Admin, Edit/Release Files, click on Add new release Paste stuff into the changelog/readme boxes -Add the pmd-jdeveloper1013-src-1.9.zip file -Add the pmd-jdeveloper1013-bin-1.9.zip file +Add the pmd-jdeveloper1111-src-1.9.0.0.1.zip file +Add the pmd-jdeveloper1111-bin-1.9.0.0.1.zip file Classify the file -Submit some news saying "hey, new release of the jdeveloper 1013 plugin!" +Submit some news saying "hey, new release of the jdeveloper 1111 plugin!" diff --git a/pmd-jdeveloper.11.1.1/etc/extension.xml b/pmd-jdeveloper.11.1.1/etc/extension.xml index 7208fe22bb..fd1951f627 100644 --- a/pmd-jdeveloper.11.1.1/etc/extension.xml +++ b/pmd-jdeveloper.11.1.1/etc/extension.xml @@ -1,28 +1,27 @@ - - PMD JDeveloper Extension - Torsten Kleiber - - ${ide.extension.install.home}/lib/pmd-4.0.jar - ${ide.extension.install.home}/lib/jaxen-1.1.jar - ${ide.extension.install.home}/lib/asm-3.0.jar - - - oracle.jdeveloper - - - + PMD JDeveloper Extension + Torsten Kleiber + + oracle.javacore + oracle.ide.ceditor + + + net.sourceforge.pmd.jdeveloper.1.9.0.0.1/lib/pmd-4.0.jar + net.sourceforge.pmd.jdeveloper.1.9.0.0.1/lib/jaxen-1.1.jar + net.sourceforge.pmd.jdeveloper.1.9.0.0.1/lib/asm-3.0.jar + + + net.sourceforge.pmd.jdeveloper.Plugin - - Provides integrated support for PMD 4.0 in JDeveloper 10.1.3 - 11.1.1. - true - - - + + Provides integrated support for PMD 4.0 in JDeveloper 11g Technology Preview 2. + false + + + diff --git a/pmd-jdeveloper.11.1.1/pmd-jdeveloper1111.jpr b/pmd-jdeveloper.11.1.1/pmd-jdeveloper1111.jpr index 9594834786..2100196d8a 100644 --- a/pmd-jdeveloper.11.1.1/pmd-jdeveloper1111.jpr +++ b/pmd-jdeveloper.11.1.1/pmd-jdeveloper1111.jpr @@ -52,6 +52,7 @@ + @@ -148,38 +149,14 @@ - - - - - - - - - - - - - + - - - - - - - - - - - - - + diff --git a/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/Plugin.java b/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/Plugin.java index da9a9a7efa..c6bddc824e 100644 --- a/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/Plugin.java +++ b/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/Plugin.java @@ -57,6 +57,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import oracle.jdeveloper.compiler.BuildSystemConfiguration; import oracle.jdeveloper.compiler.OjcConfiguration; @@ -167,6 +168,7 @@ public class Plugin implements Addin, Controller, ContextMenuListener { private boolean added; private Map pmdFileToNodeMap = new HashMap(); // whew, this is kludgey private Map cpdFileToNodeMap = new HashMap(); // whew, this is kludgey + private static BuildSystemConfiguration config; // Addin @@ -206,8 +208,8 @@ public class Plugin implements Addin, Controller, ContextMenuListener { EditorManager.getEditorManager().getContextMenu().removeContextMenuListener(this); } - public float version() { - return 1.9f; + public String version() { + return "1.9.0.0.1"; } public float ideVersion() { @@ -265,17 +267,17 @@ public class Plugin implements Addin, Controller, ContextMenuListener { e.getReason().printStackTrace(); JOptionPane.showMessageDialog(null, "Error while running PMD: " + - "\n" + e.getMessage() + "\n" + - e.getReason().getMessage(), - PMD_TITLE, - JOptionPane.ERROR_MESSAGE); + "\n" + + e.getMessage() + "\n" + + e.getReason().getMessage(), PMD_TITLE, + JOptionPane.ERROR_MESSAGE); } catch (Exception e) { logMessage(e.getMessage()); e.printStackTrace(); JOptionPane.showMessageDialog(null, "Error while running PMD: " + - "\n" + e.getMessage(), PMD_TITLE, - JOptionPane.ERROR_MESSAGE); + "\n" + + e.getMessage(), PMD_TITLE, JOptionPane.ERROR_MESSAGE); } } else if (ideAction.getCommandId() == RUN_CPD_CMD_ID) { try { @@ -331,8 +333,7 @@ public class Plugin implements Addin, Controller, ContextMenuListener { } private void setJavaVersion(Context context, PMD pmd) { - OjcConfiguration config = - OjcConfiguration.getInstance(context.getProject()); + config = BuildSystemConfiguration.getInstance(context.getProject()); String source = config.getSource(); if (source.equals("1.6")) { pmd.setJavaVersion(SourceType.JAVA_16);