diff --git a/pmd-jdeveloper.10.1.3/etc/build.xml b/pmd-jdeveloper.10.1.3/etc/build.xml
index 847f9f1354..0590f2c5c0 100644
--- a/pmd-jdeveloper.10.1.3/etc/build.xml
+++ b/pmd-jdeveloper.10.1.3/etc/build.xml
@@ -13,9 +13,9 @@
-
-
-
+
+
+
@@ -24,7 +24,7 @@
+ value="${ant.project.name}-bundle-${pluginversion}.zip"/>
@@ -112,13 +112,13 @@
-
+
-
+
-
+
diff --git a/pmd-jdeveloper.10.1.3/etc/bundle.xml b/pmd-jdeveloper.10.1.3/etc/bundle.xml
index 5daa093a5a..e98a0cf6cd 100644
--- a/pmd-jdeveloper.10.1.3/etc/bundle.xml
+++ b/pmd-jdeveloper.10.1.3/etc/bundle.xml
@@ -1,16 +1,14 @@
-
-
-
- PMD JDeveloper Extension
- 4.1.2.0.0
- Torsten Kleiber
- http://pmd.sourceforge.net/
- Provides integrated support for PMD 4.0 in JDeveloper 10.1.3 - 11.1.1.
-
-
-
-
-
+
+
+
+ PMD JDeveloper Extension
+ 4.1.2.0.0
+ Torsten Kleiber
+ http://pmd.sourceforge.net/
+ Provides integrated support for PMD 4.1 in JDeveloper 10.1.3 - 11g Technology Preview 1.
+
+
+
+
+
\ No newline at end of file
diff --git a/pmd-jdeveloper.10.1.3/etc/center.xml b/pmd-jdeveloper.10.1.3/etc/center.xml
index acec38b2b3..66011f21d0 100644
--- a/pmd-jdeveloper.10.1.3/etc/center.xml
+++ b/pmd-jdeveloper.10.1.3/etc/center.xml
@@ -1,12 +1,25 @@
-
-
-
- PMD JDeveloper Extension
- 4.1.2.0.0
- Torsten Kleiber
- http://pmd.sourceforge.net
- Provides integrated support for PMD 4.0 in JDeveloper 10.1.3 - 11.1.1.
- http://pmd.sourceforge.net/pmd-jdeveloper1013-4.1.2.0.0.zip
-
+
+
+
+ PMD JDeveloper Extension
+ 4.1.2.0.0
+ Torsten Kleiber
+ http://pmd.sourceforge.net
+ Provides integrated support for PMD 4.1 in JDeveloper 10.1.3 - 11g Technology Preview 1.
+ http://downloads.sourceforge.net/pmd/pmd-jdeveloper1013-bundle-4.1.2.0.0.zip
+
+
+
+
+
+ PMD JDeveloper Extension
+ 4.1.3.0.0
+ Torsten Kleiber
+ http://pmd.sourceforge.net
+ Provides integrated support for PMD 4.1 in JDeveloper 11g Technology Preview 2.
+ http://downloads.sourceforge.net/pmd/pmd-jdeveloper1111-bundle-4.1.3.0.0.zip
+
+
+
+
\ No newline at end of file
diff --git a/pmd-jdeveloper.10.1.3/etc/changelog.txt b/pmd-jdeveloper.10.1.3/etc/changelog.txt
index 7ec2282378..808a571959 100644
--- a/pmd-jdeveloper.10.1.3/etc/changelog.txt
+++ b/pmd-jdeveloper.10.1.3/etc/changelog.txt
@@ -1,6 +1,10 @@
+December 06, 2007 - 4.1:
+Updated PMD version to 4.1.
+Set PMD java version to project J2SE/target.
+Fix for showing rules examples in PMD property window.
+
August 06, 2007 - 1.9:
Upgraded to PMD 4.0
-Upgraded for use in JDeveloper 10.1.3 to 11.1.1
January 30, 2005 - 1.8:
Better presentation of the rule violations.
diff --git a/pmd-jdeveloper.10.1.3/etc/extension.xml b/pmd-jdeveloper.10.1.3/etc/extension.xml
index 22921b94ec..2754117bd8 100644
--- a/pmd-jdeveloper.10.1.3/etc/extension.xml
+++ b/pmd-jdeveloper.10.1.3/etc/extension.xml
@@ -1,28 +1,26 @@
-
- PMD JDeveloper Extension
- Torsten Kleiber
-
- ${ide.extension.install.home}/lib/pmd-4.1.jar
- ${ide.extension.install.home}/lib/jaxen-1.1.1.jar
- ${ide.extension.install.home}/lib/asm-3.1.jar
-
-
- oracle.jdeveloper
-
-
-
+ PMD JDeveloper Extension
+ Torsten Kleiber
+
+ oracle.jdeveloper
+
+
+ net.sourceforge.pmd.jdeveloper.4.1.2.0.0/lib/pmd-4.1.jar
+ net.sourceforge.pmd.jdeveloper.4.1.2.0.0/lib/jaxen-1.1.1.jar
+ net.sourceforge.pmd.jdeveloper.4.1.2.0.0/lib/asm-3.1.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.1 in JDeveloper 10.1.3 - 11g Technology Preview 1.
+ false
+
+
+
diff --git a/pmd-jdeveloper.10.1.3/pmd-jdeveloper1013.jpr b/pmd-jdeveloper.10.1.3/pmd-jdeveloper1013.jpr
index 952a136e26..8f24f49683 100644
--- a/pmd-jdeveloper.10.1.3/pmd-jdeveloper1013.jpr
+++ b/pmd-jdeveloper.10.1.3/pmd-jdeveloper1013.jpr
@@ -116,7 +116,7 @@
-
+
@@ -131,7 +131,7 @@
-
+
diff --git a/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/Plugin.java b/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/Plugin.java
index a8d05b0fe9..e1173ecd18 100644
--- a/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/Plugin.java
+++ b/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/Plugin.java
@@ -9,7 +9,6 @@ import net.sourceforge.pmd.cpd.CPD;
import net.sourceforge.pmd.cpd.LanguageFactory;
import net.sourceforge.pmd.cpd.Match;
import net.sourceforge.pmd.cpd.TokenEntry;
-import net.sourceforge.pmd.SourceType;
import oracle.ide.Addin;
import oracle.ide.AddinManager;
@@ -35,7 +34,6 @@ import oracle.ide.navigator.NavigatorManager;
import oracle.ide.panels.Navigable;
import oracle.jdeveloper.compiler.IdeLog;
-import oracle.jdeveloper.compiler.OjcConfigurationPanel;
import oracle.jdeveloper.compiler.IdeStorage;
import oracle.jdeveloper.model.JavaSourceNode;
@@ -57,9 +55,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import oracle.jdeveloper.compiler.OjcConfiguration;
-
-
public class Plugin implements Addin, Controller, ContextMenuListener {
public class CPDViolationPage extends AbstractLogPage implements TreeSelectionListener {
@@ -195,7 +190,7 @@ public class Plugin implements Addin, Controller, ContextMenuListener {
IdeSettings.registerUI(new Navigable(PMD_TITLE, SettingsPanel.class,
new Navigable[] { }));
Ide.getVersionInfo().addComponent(PMD_TITLE,
- " JDeveloper Extension " + version());
+ "JDeveloper Extension " + Version.version());
ruleViolationPage = new RuleViolationPage();
// cpdViolationPage = new CPDViolationPage();
@@ -206,10 +201,6 @@ public class Plugin implements Addin, Controller, ContextMenuListener {
EditorManager.getEditorManager().getContextMenu().removeContextMenuListener(this);
}
- public String version() {
- return "4.1.2.0.0";
- }
-
public float ideVersion() {
return 0.1f;
}
@@ -236,7 +227,7 @@ public class Plugin implements Addin, Controller, ContextMenuListener {
try {
pmdFileToNodeMap.clear();
PMD pmd = new PMD();
- setJavaVersion(context, pmd);
+ Version.setJavaVersion(context, pmd);
SelectedRules rules =
new SelectedRules(SettingsPanel.createSettingsStorage());
@@ -330,21 +321,6 @@ public class Plugin implements Addin, Controller, ContextMenuListener {
return true;
}
- private void setJavaVersion(Context context, PMD pmd) {
- OjcConfiguration config =
- OjcConfiguration.getInstance(context.getProject());
- String source = config.getSource();
- if (source.equals("1.6")) {
- pmd.setJavaVersion(SourceType.JAVA_16);
- } else if (source.equals("1.5")) {
- pmd.setJavaVersion(SourceType.JAVA_15);
- } else if (source.equals("1.4")) {
- pmd.setJavaVersion(SourceType.JAVA_14);
- } else if (source.equals("1.3")) {
- pmd.setJavaVersion(SourceType.JAVA_13);
- }
- }
-
public boolean update(IdeAction ideAction, Context context) {
return false;
}
diff --git a/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/SettingsPanel.java b/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/SettingsPanel.java
index 3d895f871c..5fb6fc5d82 100644
--- a/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/SettingsPanel.java
+++ b/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/SettingsPanel.java
@@ -85,7 +85,7 @@ public class SettingsPanel extends DefaultTraversablePanel {
exampleTextArea.setCaretPosition(0);
}
}
- }
+ }
public class CheckboxListCellRenderer implements ListCellRenderer {
public Component getListCellRendererComponent(JList list,
diff --git a/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/Version.java b/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/Version.java
new file mode 100644
index 0000000000..dc121cc42a
--- /dev/null
+++ b/pmd-jdeveloper.10.1.3/src/net/sourceforge/pmd/jdeveloper/Version.java
@@ -0,0 +1,30 @@
+package net.sourceforge.pmd.jdeveloper;
+
+import net.sourceforge.pmd.PMD;
+import net.sourceforge.pmd.SourceType;
+
+import oracle.ide.Context;
+
+import oracle.jdeveloper.compiler.OjcConfiguration;
+
+class Version {
+ public static void setJavaVersion(Context context, PMD pmd) {
+ OjcConfiguration config =
+ OjcConfiguration.getInstance(context.getProject());
+ String source = config.getSource();
+ if (source.equals("1.6")) {
+ pmd.setJavaVersion(SourceType.JAVA_16);
+ } else if (source.equals("1.5")) {
+ pmd.setJavaVersion(SourceType.JAVA_15);
+ } else if (source.equals("1.4")) {
+ pmd.setJavaVersion(SourceType.JAVA_14);
+ } else if (source.equals("1.3")) {
+ pmd.setJavaVersion(SourceType.JAVA_13);
+ }
+ }
+
+ public static String version() {
+ return "4.1.2.0.0";
+ }
+
+}