|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
|
|
SF.net SVN: pmd:[6991] trunk/pmd-jdeveloper.11.1.1Revision: 6991
http://pmd.svn.sourceforge.net/pmd/?rev=6991&view=rev Author: tkleiber Date: 2009-10-17 13:29:47 +0000 (Sat, 17 Oct 2009) Log Message: ----------- Release 4.2.5.3.0 Modified Paths: -------------- trunk/pmd-jdeveloper.11.1.1/etc/build.xml trunk/pmd-jdeveloper.11.1.1/etc/bundle.xml trunk/pmd-jdeveloper.11.1.1/etc/changelog.txt trunk/pmd-jdeveloper.11.1.1/etc/doing_the_next_pmd_jdeveloper_release.txt trunk/pmd-jdeveloper.11.1.1/etc/extension.xml trunk/pmd-jdeveloper.11.1.1/pmd-jdeveloper1111.jpr trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/FileStorage.java trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/SettingsPanel.java trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/Version.java Added Paths: ----------- trunk/pmd-jdeveloper.11.1.1/conf/pmd.plugin.properties trunk/pmd-jdeveloper.11.1.1/conf/pmd.rule.properties trunk/pmd-jdeveloper.11.1.1/lib/pmd-4.2.5.jar Removed Paths: ------------- trunk/pmd-jdeveloper.11.1.1/lib/pmd-4.2.4.jar trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/IDEStorage.java Added: trunk/pmd-jdeveloper.11.1.1/conf/pmd.plugin.properties =================================================================== --- trunk/pmd-jdeveloper.11.1.1/conf/pmd.plugin.properties (rev 0) +++ trunk/pmd-jdeveloper.11.1.1/conf/pmd.plugin.properties 2009-10-17 13:29:47 UTC (rev 6991) @@ -0,0 +1,2 @@ +pmd.settings.separate=false +pmd.settings.separate.name= Modified: trunk/pmd-jdeveloper.11.1.1/etc/build.xml =================================================================== --- trunk/pmd-jdeveloper.11.1.1/etc/build.xml 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/etc/build.xml 2009-10-17 13:29:47 UTC (rev 6991) @@ -3,18 +3,18 @@ <property name="config" value="config/"/> <property name="src" value="src/"/> <property name="etc" value="etc/"/> - <property name="pmdjar" value="pmd-4.2.4.jar"/> + <property name="pmdjar" value="pmd-4.2.5.jar"/> <!-- first to third number for the pmd plugin --> <!-- fourth number JDeveloper Version 1:9.0.5-10.1.2, 2:10.1.3, 3:11.1.1 --> <!-- fifth number minor version number for the JDeveloper Plugin --> - <property name="pluginversion" value="4.2.4.3.0"/> + <property name="pluginversion" value="4.2.5.3.0"/> <property name="mainclass" value="net.sourceforge.pmd.jdeveloper"/> - <property name="jdeveloper.dir" value="C:/Oracle/11gJD11110/jdeveloper"/> + <property name="jdeveloper.dir" value="C:/Oracle/11gJD111110/jdeveloper"/> <property name="jdeveloper.ext.subdir" value="jdev/extensions"/> <property name="release.dir" value="C:/Documents and Settings/Torsten/My Documents/Eigene Programme/Java/PMD/releases"/> - <property name="uploadbundle.scp.user" value="tkleiber@..."/> - <property name="uploadbundle.scp.pwd" value="tkl7035"/> + <property name="uploadbundle.scp.user" value="***"/> + <property name="uploadbundle.scp.pwd" value="***"/> <property name="upload.ftp.pwd" value=""/> <!-- builded properties --> <property name="release.dirname" value="${mainclass}.${pluginversion}"/> @@ -72,6 +72,10 @@ todir="${jdeveloper.install.dir}/${mainclass}.${pluginversion}/lib"/> <copy file="lib/asm-3.1.jar" todir="${jdeveloper.install.dir}/${mainclass}.${pluginversion}/lib"/> + <copy file="conf/pmd.plugin.properties" + todir="${jdeveloper.install.dir}/${mainclass}.${pluginversion}/conf"/> + <copy file="conf/pmd.rule.properties" + todir="${jdeveloper.install.dir}/${mainclass}.${pluginversion}/conf"/> </target> <target name="release" depends="clean,jar"> <mkdir dir="tmp/${release.dirname}/lib"/> @@ -79,6 +83,8 @@ <copy file="lib/${pmdjar}" todir="tmp/${release.dirname}/lib"/> <copy file="lib/jaxen-1.1.1.jar" todir="tmp/${release.dirname}/lib"/> <copy file="lib/asm-3.1.jar" todir="tmp/${release.dirname}/lib"/> + <copy file="conf/pmd.plugin.properties" todir="tmp/${release.dirname}/conf"/> + <copy file="conf/pmd.rule.properties" todir="tmp/${release.dirname}/conf"/> <zip destfile="${release.zipname}" basedir="tmp/"/> <move file="${release.zipname}" todir="${release.dir}"/> <delete dir="tmp"/> @@ -106,6 +112,10 @@ todir="update-center-bundle/${mainclass}.${pluginversion}/lib/"/> <copy file="lib/asm-3.1.jar" todir="update-center-bundle/${mainclass}.${pluginversion}/lib/"/> + <copy file="conf/pmd.plugin.properties" + todir="update-center-bundle/${mainclass}.${pluginversion}/conf"/> + <copy file="conf/pmd.rule.properties" + todir="update-center-bundle/${mainclass}.${pluginversion}/conf"/> <zip destfile="update-center-bundle/${bundle.filename}" basedir="update-center-bundle"> <exclude name="center.xml"/> Modified: trunk/pmd-jdeveloper.11.1.1/etc/bundle.xml =================================================================== --- trunk/pmd-jdeveloper.11.1.1/etc/bundle.xml 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/etc/bundle.xml 2009-10-17 13:29:47 UTC (rev 6991) @@ -2,13 +2,13 @@ <update-bundle version="1.0" xmlns="http://xmlns.oracle.com/jdeveloper/updatebundle"> <update id="net.sourceforge.pmd.jdeveloper" xmlns="http://xmlns.oracle.com/jdeveloper/update"> <name>PMD JDeveloper Extension</name> - <version>4.2.4.3.0</version> + <version>4.2.5.3.0</version> <author>Torsten Kleiber</author> <author-url>http://pmd.sourceforge.net/</author-url> - <description>Provides integrated support for PMD 4.2.4 in JDeveloper 11g.</description> + <description>Provides integrated support for PMD 4.2.5 in JDeveloper 11g.</description> <requirements> <requires-extension id="oracle.jdeveloper" minVersion="11.1.1.0.31.51.56" - maxVersion="11.1.1.0.31.51.56"/> + maxVersion="11.1.1.99"/> </requirements> </update> </update-bundle> \ No newline at end of file Modified: trunk/pmd-jdeveloper.11.1.1/etc/changelog.txt =================================================================== --- trunk/pmd-jdeveloper.11.1.1/etc/changelog.txt 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/etc/changelog.txt 2009-10-17 13:29:47 UTC (rev 6991) @@ -1,3 +1,7 @@ +October 14, 2009 - 4.2.5: +Updated PMD version to 4.2.5 for 10.1.3 to 11.1.1 +Fixed bug 2543957 + October 21, 2008 - 4.2.4: Updated PMD version to 4.2.4 for 9.0.5 to 11.1.1 Modified: trunk/pmd-jdeveloper.11.1.1/etc/doing_the_next_pmd_jdeveloper_release.txt =================================================================== --- trunk/pmd-jdeveloper.11.1.1/etc/doing_the_next_pmd_jdeveloper_release.txt 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/etc/doing_the_next_pmd_jdeveloper_release.txt 2009-10-17 13:29:47 UTC (rev 6991) @@ -20,7 +20,7 @@ src release: // TODO automation by ant, if subversion tasks are available -checkin +checkin // TODO automation by ant, if subversion tasks are available copy to tags/pmd-jdeveloper/pmd_jdeveloperXXX_release_X_X_X_X_X ant releasesrc Modified: trunk/pmd-jdeveloper.11.1.1/etc/extension.xml =================================================================== --- trunk/pmd-jdeveloper.11.1.1/etc/extension.xml 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/etc/extension.xml 2009-10-17 13:29:47 UTC (rev 6991) @@ -1,6 +1,6 @@ <?xml version = '1.0' encoding = 'UTF-8'?> <extension xmlns="http://jcp.org/jsr/198/extension-manifest" - id="net.sourceforge.pmd.jdeveloper" version="4.2.4.3.0" + id="net.sourceforge.pmd.jdeveloper" version="4.2.5.3.0" esdk-version="1.0"> <name>PMD JDeveloper Extension</name> <owner>Torsten Kleiber</owner> @@ -10,9 +10,9 @@ <import>oracle.ide.ceditor</import> </dependencies> <classpaths> - <classpath>net.sourceforge.pmd.jdeveloper.4.2.4.3.0/lib/pmd-4.2.4.jar</classpath> - <classpath>net.sourceforge.pmd.jdeveloper.4.2.4.3.0/lib/jaxen-1.1.1.jar</classpath> - <classpath>net.sourceforge.pmd.jdeveloper.4.2.4.3.0/lib/asm-3.1.jar</classpath> + <classpath>net.sourceforge.pmd.jdeveloper.4.2.5.3.0/lib/pmd-4.2.5.jar</classpath> + <classpath>net.sourceforge.pmd.jdeveloper.4.2.5.3.0/lib/jaxen-1.1.1.jar</classpath> + <classpath>net.sourceforge.pmd.jdeveloper.4.2.5.3.0/lib/asm-3.1.jar</classpath> </classpaths> <hooks> <jdeveloper-hook xmlns="http://xmlns.oracle.com/jdeveloper/1013/extension"> @@ -21,7 +21,7 @@ </addins> </jdeveloper-hook> <feature-hook> - <description>Provides integrated support for PMD 4.2 in JDeveloper 11g Technology Preview 4.</description> + <description>Provides integrated support for PMD 4.2.5 in JDeveloper 11g.</description> <optional>false</optional> </feature-hook> </hooks> Deleted: trunk/pmd-jdeveloper.11.1.1/lib/pmd-4.2.4.jar =================================================================== (Binary files differ) Added: trunk/pmd-jdeveloper.11.1.1/lib/pmd-4.2.5.jar =================================================================== (Binary files differ) Property changes on: trunk/pmd-jdeveloper.11.1.1/lib/pmd-4.2.5.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/pmd-jdeveloper.11.1.1/pmd-jdeveloper1111.jpr =================================================================== --- trunk/pmd-jdeveloper.11.1.1/pmd-jdeveloper1111.jpr 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/pmd-jdeveloper1111.jpr 2009-10-17 13:29:47 UTC (rev 6991) @@ -2,52 +2,63 @@ <jpr:project xmlns:jpr="http://xmlns.oracle.com/ide/project"> <hash n="component-versions"> <value n="oracle.adf.dt.migration.ProjectMigrator" v="10.1.3.3.0"/> - <value n="oracle.adfdt.controller.adfc.source.migration.AdfControllerSchemaMigrator" v="11.1.1.0.0"/> - <value n="oracle.adfdt.controller.adfc.source.migration.MoveMetadataResourcesAgainMigrator" v="11.1.1.0.0"/> - <value n="oracle.adfdt.controller.common.migrator.ProjectMigrator" v="11.1.1.0.0"/> + <value n="oracle.adfdt.controller.adfc.source.migration.AdfControllerSchemaMigrator" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.adfdt.controller.adfc.source.migration.MoveMetadataResourcesAgainMigrator" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.adfdt.controller.common.migrator.ProjectMigrator" v="11.1.1.0.0;11.1.1.1.0"/> <value n="oracle.adfdt.controller.jsf.addin.JSFProjectMigrator" v="10.1.3.3.0"/> - <value n="oracle.adfdt.controller.jsf2.diagram.migrate.JsfNodeMigratorHelper" v="11.1.1.0.0"/> - <value n="oracle.adfdt.controller.struts.addin.db.ADFStrutsProjectMigrator" v="10.1.3.3.0;11.1.1.0.0"/> - <value n="oracle.adfdt.controller.struts.addin.StrutsProjectMigrator" v="10.1.3.3.0;11.1.1.0.0"/> + <value n="oracle.adfdt.controller.jsf2.diagram.migrate.JsfNodeMigratorHelper" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.adfdt.controller.struts.addin.db.ADFStrutsProjectMigrator" v="10.1.3.3.0;11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.adfdt.controller.struts.addin.StrutsProjectMigrator" v="10.1.3.3.0;11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.adfdtinternal.dvt.datapresdt.migration.DVTDataMapMigrator" v="11.1.1.1.0"/> <value n="oracle.adfdtinternal.dvt.datapresdt.migration.JspProjectMigrator" v="11.1.1.0.0"/> - <value n="oracle.adfdtinternal.model.ide.migration.ProjectMigrator" v="11.1.1.0.0;11.1.1.0.0.11;11.1.1.0.0.11.1"/> + <value n="oracle.adfdtinternal.model.ide.migration.ProjectMigrator" v="11.1.1.0.0;11.1.1.0.0.11;11.1.1.0.0.11.1;11.1.1.1.0.11.1.1"/> + <value n="oracle.adfdtinternal.model.ide.security.wizard.FormPageMigrator" v="11.1.1.0.0"/> + <value n="oracle.adfdtinternal.model.ide.security.wizard.JpsFilterMigrator" v="11.1.1.1.0"/> <value n="oracle.adfdtinternal.model.ide.xmled.migration.ADFNodeMigrator" v="11.1.1.46.84"/> - <value n="oracle.adfdtinternal.model.ide.xmled.migration.PageDefinitionParameterValueMigrator" v="11.1.1.0.0.5"/> + <value n="oracle.adfdtinternal.model.ide.xmled.migration.PageDefinitionParameterValueMigrator" v="11.1.1.0.0.5;11.1.1.1.0.5"/> + <value n="oracle.adfdtinternal.model.ide.xmled.migration.WebXmlMigrator" v="11.1.1.1.0"/> <value n="oracle.adfdtinternal.model.portlet.migration.WebCenterProjectMigrator" v="10.1.3.3.0"/> - <value n="oracle.adfdtinternal.view.common.migration.wizards.MigrationHelper" v="11.1.1.0.0;11.1.1.0.0.3"/> + <value n="oracle.adfdtinternal.view.common.migration.wizards.MigrationHelper" v="11.1.1.0.0;11.1.1.0.0.3;11.1.1.1.0.3"/> <value n="oracle.adfdtinternal.view.faces.addin.ADFFacesLibraryMigrator" v="10.1.3.3.0"/> - <value n="oracle.adfdtinternal.view.rich.binding.migration.JarResourceMigrator" v="11.1.1.0.0"/> - <value n="oracle.bm.commonIde.ProjectUpgrader" v="10.1.3.3.0;11.1.1.0.0"/> - <value n="oracle.bm.migration.project.MigratorRegistryProjectUpgradeAdapter" v="11.1.1.0.0"/> - <value n="oracle.ide.model.Project" v="10.1.3.3.0;11.1.1.0.0"/> - <value n="oracle.ide.model.ResourcePathsMigrator" v="10.1.3.3.0;11.1.1.0.0"/> - <value n="oracle.jbo.dt.jclient.migrator.JCProjectMigrator" v="10.1.3.3.0;11.1.1.0.0"/> - <value n="oracle.jbo.dt.jdevx.deployment.JbdProjectMigrator" v="11.1.1.0.0"/> + <value n="oracle.adfdtinternal.view.rich.binding.migration.JarResourceMigrator" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.adfdtinternal.view.rich.migration.ComponentIdNodeMigratorHelper" v="11.1.1.1.0.01"/> + <value n="oracle.adfdtinternal.view.rich.migration.LibraryVersionMigrator" v="11.1.1.1.0"/> + <value n="oracle.bm.commonIde.ProjectUpgrader" v="10.1.3.3.0;11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.bm.migration.project.MigratorRegistryProjectUpgradeAdapter" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.ide.model.Project" v="10.1.3.3.0;11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.ide.model.ResourcePathsMigrator" v="10.1.3.3.0;11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.jbo.dt.jclient.migrator.JCProjectMigrator" v="10.1.3.3.0;11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.jbo.dt.jdevx.deployment.JbdProjectMigrator" v="11.1.1.0.0;11.1.1.1.0"/> <value n="oracle.jbo.dt.jdevx.ui.appnav.APProjectMigrator" v="10.1.3.3.0;11.1.1.46.84"/> - <value n="oracle.jbo.dt.migrate.ResourceBundlePathMigrator" v="11.1.1.0.0.5"/> - <value n="oracle.jbo.dt.migration.ServiceInterfaceMigrator" v="11.1.1.0.0"/> + <value n="oracle.jbo.dt.migrate.ResourceBundlePathMigrator" v="11.1.1.0.0.5;11.1.1.1.0.5"/> + <value n="oracle.jbo.dt.migration.ServiceInterfaceMigrator" v="11.1.1.0.0;11.1.1.1.0"/> <value n="oracle.jdeveloper.dbmodeler.migration.ProjectMigratorHelper" v="10.1.3.3.0"/> - <value n="oracle.jdeveloper.ejb.EjbMigrator" v="10.1.3.3.0;11.1.1.0.0"/> - <value n="oracle.jdeveloper.library.ProjectLibraryMigrator" v="11.1.1.0.0"/> - <value n="oracle.jdeveloper.model.OutputDirectoryMigrator" v="11.1.1.0.0"/> + <value n="oracle.jdeveloper.ejb.EjbMigrator" v="10.1.3.3.0;11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.jdeveloper.library.ProjectLibraryMigrator" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.jdeveloper.model.OutputDirectoryMigrator" v="11.1.1.0.0;11.1.1.1.0"/> <value n="oracle.jdeveloper.offlinedb.migration.OfflineDBProjectMigrator" v="10.1.3.3.0"/> - <value n="oracle.jdevimpl.deploy.DeploymentProfilesMigrator" v="11.1.1.0.0.1"/> - <value n="oracle.jdevimpl.deploy.jps.JpsDataMigrator" v="11.1.1.0.0"/> + <value n="oracle.jdevimpl.deploy.DeploymentProfilesMigrator" v="11.1.1.0.0.1;11.1.1.1.0"/> + <value n="oracle.jdevimpl.deploy.jps.JpsDataMigrator" v="11.1.1.0.0;11.1.1.1.0"/> <value n="oracle.jdevimpl.jsp.JsfLibraryMigrator" v="10.1.3.3.0"/> <value n="oracle.jdevimpl.jsp.JspMigrator" v="10.1.3.1.0;11.1.1.0.0"/> - <value n="oracle.jdevimpl.offlinedb.migration.OfflineDBProjectMigrator" v="11.1.1.0.0"/> - <value n="oracle.jdevimpl.offlinedb.migration.OfflineTransferMigrator" v="11.1.1.0.0"/> - <value n="oracle.jdevimpl.resourcebundle.XliffAddin$XliffMigratorHelper" v="11.1.1.0.0"/> + <value n="oracle.jdevimpl.offlinedb.migration.OfflineDBProjectMigrator" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.jdevimpl.offlinedb.migration.OfflineTransferMigrator" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.jdevimpl.resourcebundle.XliffAddin$XliffMigratorHelper" v="11.1.1.0.0;11.1.1.1.0"/> <value n="oracle.jdevimpl.runner.RunConfigurationsMigrator" v="10.1.3.3.0;11.1.1.0.0"/> - <value n="oracle.jdevimpl.webapp.jsp.libraries.JspLibraryMigrator" v="11.1.1.0.0;11.1.1.1.3"/> - <value n="oracle.jdevimpl.webapp.WebAppNodeMigratorHelper" v="11.1.1.0.0"/> - <value n="oracle.jdevimpl.webservices.WebServicesMigratorHelper" v="10.1.3.3.0;11.1.1.0.0"/> - <value n="oracle.jdevimpl.xml.wl.WeblogicMigratorHelper" v="11.1.1.0.0"/> + <value n="oracle.jdevimpl.webapp.jsp.libraries.JspLibraryMigrator" v="11.1.1.0.0;11.1.1.1.3;11.1.1.1.4"/> + <value n="oracle.jdevimpl.webapp.WebAppContentSetNodeMigratorHelper" v="11.1.1"/> + <value n="oracle.jdevimpl.webapp.WebAppNodeMigratorHelper" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.jdevimpl.webservices.WebServicesMigratorHelper" v="10.1.3.3.0;11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.jdevimpl.xml.wl.WeblogicMigratorHelper" v="11.1.1.0.0;11.1.1.1.0"/> <value n="oracle.modeler.bmmigrate.dif.MigrateToDIF" v="11.1.1.0.0"/> + <value n="oracle.modeler.bmmigrate.management.Migration" v="11.1.1.1.0"/> + <value n="oracle.tip.tools.ide.fabric.addin.SCAProjectMigrator" v="11.1.1.1.0.06"/> + <value n="oracle.tip.tools.ide.pm.addin.migrator.PMProjectMigrator" v="11.1.1.1.0"/> <value n="oracle.tip.tools.ide.pm.addin.PMProjectMigrator" v="10.1.3.3.0"/> <value n="oracle.toplink.addin.migration.TopLinkProjectMigrator" v="10.1.3.1.0"/> - <value n="oracle.toplink.workbench.addin.migration.PersistenceProjectMigrator" v="11.1.1.0.0.1"/> - <value n="oracle.toplink.workbench.addin.migration.TopLinkProjectMigrator" v="11.1.1.0.0"/> + <value n="oracle.toplink.workbench.addin.migration.PersistenceProjectMigrator" v="11.1.1.0.0.1;11.1.1.1.1"/> + <value n="oracle.toplink.workbench.addin.migration.TopLinkProjectMigrator" v="11.1.1.0.0;11.1.1.1.0"/> + <value n="oracle.webcenter.internal.dt.migration.WebCenterProjectMigrator" v="11.1.1.1.0.090618.1120;11.1.1.1.0.090820.0735"/> </hash> <list n="contentSets"> <string v="oracle.jdeveloper.model.PathsConfiguration/javaContentSet"/> @@ -58,6 +69,8 @@ <string v="oracle.tip.tools.ide.pm.addin.PMProjectSettings/Integration_Content"/> <string v="oracle.toplink.workbench.addin/toplinkContentSet"/> <string v="oracle.adfdtinternal.model.ide.settings.ADFMSettings/adfmContentSet"/> + <string v="oracle.mds.internal.dt.ide.MDSLibraryCustCSProvider/mdsContentSet"/> + <string v="oracle.tip.tools.ide.fabric.addin.SCAContentSetProvider/sca-content"/> </list> <value n="defaultPackage" v="net.sourceforge.pmd.jdeveloper"/> <value n="dvt-geomap-visible-to-rendered" v="true"/> @@ -108,6 +121,14 @@ <url path="lib/"/> </list> </hash> + <hash> + <list n="pattern-filters"> + <string v="+**"/> + </list> + <list n="url-path"> + <url path="conf/"/> + </list> + </hash> </list> <list n="url-path"/> </hash> @@ -115,10 +136,126 @@ <hash n="oracle.jdeveloper.compiler.OjcConfiguration"> <value n="internalEncoding" v="Cp1252"/> </hash> + <hash n="oracle.jdeveloper.deploy.dt.DeploymentProfiles"> + <hash n="profileDefinitions"> + <hash n="edtExtensionProfile"> + <hash n="archiveOptions"> + <value n="hasManifest" v="true"/> + </hash> + <hash n="fileGroups"> + <list n="groups"> + <hash> + <list n="contributors"> + <hash> + <value n="type" v="2"/> + </hash> + <hash> + <value n="type" v="7"/> + </hash> + </list> + <value n="displayName" v="Project Output"/> + <hash n="filters"> + <list n="rules"> + <hash> + <value n="pattern" v="WEB-INF/temp/**"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="WEB-INF/classes/jsp_servlet/**"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v=".wlsjsps/"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v=".wlLibs/"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**/.svn/"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**/CVS/"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**/.ade_path"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**/.data/**"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**.cdi"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**.contrib"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**.keep"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**.rvi"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v=".jsps/"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v=".tags/"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v=".dtags/"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**/*.jht"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**/*.jjt"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**/*.jxt"/> + <value n="type" v="1"/> + </hash> + <hash> + <value n="pattern" v="**"/> + </hash> + </list> + </hash> + <value n="internalName" v="project-output"/> + <value n="type" v="1"/> + </hash> + </list> + </hash> + <value n="jarURL"/> + <value n="profileClass" v="oracle.jdevimpl.extensiondt.deploy.ExtensionProfile"/> + <value n="profileName" v="edtExtensionProfile"/> + </hash> + </hash> + <list n="profileList"> + <string v="edtExtensionProfile"/> + </list> + </hash> <hash n="oracle.jdeveloper.model.J2eeSettings"> <value n="j2eeWebAppName" v="PMD-pmd-jdeveloper1013-webapp"/> <value n="j2eeWebContextRoot" v="PMD-pmd-jdeveloper1013-context-root"/> <hash n="webContentSet"> + <list n="pattern-filters"> + <string v="-WEB-INF/temp/"/> + <string v="-WEB-INF/classes/"/> + <string v="+**"/> + </list> <list n="url-path"> <url path="public_html/"/> </list> @@ -150,13 +287,13 @@ <value n="custom" v="false"/> <value n="javaOptions" v=""/> <value n="name" v="Default"/> - <url n="targetURL" path="../../../../../../../Oracle/10gJD10132/jdev/bin/jdev.conf"/> + <url n="targetURL" path="../../../../../../../Oracle/11gJD111110/jdeveloper/jdev/bin/jdev.conf"/> </hash> <hash n="Verbose"> <value n="custom" v="false"/> <value n="javaOptions" v="-verbose:class"/> <value n="name" v="Verbose"/> - <url n="targetURL" path="../../../../../../../Oracle/11gJD11110_P4/jdev/bin/jdev.conf"/> + <url n="targetURL" path="../../../../../../../Oracle/11gJD111110/jdeveloper/jdev/bin/jdev.conf"/> </hash> </hash> <list n="runConfigurationList"> @@ -167,22 +304,22 @@ <hash n="oracle.jdevimpl.config.JProjectLibraries"> <list n="exportedReferences"> <hash> - <url n="id" path="../../../../../Application Data/JDeveloper/system11.1.1.0.20.46.84/o.jdeveloper/Extension SDK Doc.library"/> + <url n="id" path="../../../../../Application Data/JDeveloper/system11.1.1.0.22.49.49/o.jdeveloper/pmd-4.2.5.library"/> <value n="isJDK" v="false"/> </hash> <hash> - <url n="id" path="../../../../../Application Data/JDeveloper/system11.1.1.0.22.49.49/o.jdeveloper/pmd-4.2.4.library"/> + <url n="id" path="../../../../../Application Data/JDeveloper/system11.1.1.1.33.54.07/o.jdeveloper/Extension SDK Documentation.library"/> <value n="isJDK" v="false"/> </hash> </list> <hash n="internalDefinitions"/> <list n="libraryReferences"> <hash> - <url n="id" path="../../../../../Application Data/JDeveloper/system11.1.1.0.20.46.84/o.jdeveloper/Extension SDK Doc.library"/> + <url n="id" path="../../../../../Application Data/JDeveloper/system11.1.1.0.22.49.49/o.jdeveloper/pmd-4.2.5.library"/> <value n="isJDK" v="false"/> </hash> <hash> - <url n="id" path="../../../../../Application Data/JDeveloper/system11.1.1.0.22.49.49/o.jdeveloper/pmd-4.2.4.library"/> + <url n="id" path="../../../../../Application Data/JDeveloper/system11.1.1.1.33.54.07/o.jdeveloper/Extension SDK Documentation.library"/> <value n="isJDK" v="false"/> </hash> </list> @@ -190,6 +327,20 @@ <hash n="oracle.jdevimpl.config.JProjectPaths"> <url n="outputDirectory" path="classes/"/> </hash> + <hash n="oracle.mds.internal.dt.ide.MDSLibraryCustCSProvider"> + <hash n="mdsContentSet"> + <list n="pattern-filters"> + <string v="+**/mdssys/cust/**"/> + <string v="+mdssys/cust/**"/> + </list> + <list n="url-path"> + <url path="libraryCustomizations/"/> + </list> + </hash> + </hash> + <hash n="oracle.tip.tools.ide.fabric.addin.SCAContentSetProvider"> + <hash n="sca-content"/> + </hash> <hash n="oracle.tip.tools.ide.pm.addin.PMProjectSettings"> <hash n="Integration_Content"> <list n="pattern-filters"> Modified: trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/FileStorage.java =================================================================== --- trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/FileStorage.java 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/FileStorage.java 2009-10-17 13:29:47 UTC (rev 6991) @@ -38,7 +38,7 @@ final FileOutputStream fos = new FileOutputStream(file); savedProperties.store(fos, - "PMD-JDeveloper rule selections " + new Date()); + "PMD generated file " + new Date()); fos.close(); } catch (FileNotFoundException e) { Util.logMessage(e.getStackTrace()); Deleted: trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/IDEStorage.java =================================================================== --- trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/IDEStorage.java 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/IDEStorage.java 2009-10-17 13:29:47 UTC (rev 6991) @@ -1,22 +0,0 @@ -package net.sourceforge.pmd.jdeveloper; - -import java.util.Iterator; -import java.util.Properties; - -import oracle.ide.Ide; - - -public class IDEStorage implements SettingsStorage { - - public void save(final Properties props) throws SettingsException { - for (final Iterator i = props.keySet().iterator(); i.hasNext(); ) { - final String key = (String)i.next(); - final String value = props.getProperty(key); - Ide.setProperty(key, value); - } - } - - public String load(final String key) throws SettingsException { - return Ide.getProperty(key); - } -} Modified: trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/SettingsPanel.java =================================================================== --- trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/SettingsPanel.java 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/SettingsPanel.java 2009-10-17 13:29:47 UTC (rev 6991) @@ -10,22 +10,26 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; +import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.List; +import java.util.Properties; import java.util.Set; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JCheckBox; +import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; +import javax.swing.JTextField; import javax.swing.ListCellRenderer; import javax.swing.ListModel; import javax.swing.ListSelectionModel; @@ -39,15 +43,24 @@ import net.sourceforge.pmd.RuleSets; import net.sourceforge.pmd.RuleSetWriter; +import oracle.ide.Ide; import oracle.ide.panels.DefaultTraversablePanel; import oracle.ide.panels.TraversableContext; public class SettingsPanel extends DefaultTraversablePanel { + private static final String PLUGIN_HOME = + "/extensions/net.sourceforge.pmd.jdeveloper." + Version.version() + + "/conf/"; + private static final String PLUGIN_PROPS = + PLUGIN_HOME + "pmd.plugin.properties"; + private static final String RULE_PROPS = + PLUGIN_HOME + "pmd.rule.properties"; + private class ImportListener implements ActionListener { public void actionPerformed(final ActionEvent evt) { - final FileDialog fdlg = + final FileDialog fdlg = new FileDialog(new Frame(), "Import", FileDialog.LOAD); fdlg.setVisible(true); if (fdlg.getFile() == null) { @@ -60,7 +73,7 @@ private class ExportListener implements ActionListener { public void actionPerformed(final ActionEvent evt) { - final FileDialog fdlg = + final FileDialog fdlg = new FileDialog(new Frame(), "Export", FileDialog.SAVE); fdlg.setVisible(true); if (fdlg.getFile() == null) { @@ -71,6 +84,20 @@ } } + private class FindListener implements ActionListener { + + public void actionPerformed(ActionEvent evt) { + FileDialog fdlg = + new FileDialog(new Frame(), "Find", FileDialog.LOAD); + fdlg.setVisible(true); + String selected = fdlg.getDirectory() + fdlg.getFile(); + if (fdlg.getFile() == null) { + return; + } + selectedRulesSeparateFileNameField.setText(selected); + } + } + private class CheckboxList extends JList { private class MyMouseAdapter extends MouseAdapter { @@ -81,7 +108,8 @@ public void mousePressed(final MouseEvent evt) { final int index = locationToIndex(evt.getPoint()); if (index != -1) { - final JCheckBox box = (JCheckBox)getModel().getElementAt(index); + final JCheckBox box = + (JCheckBox)getModel().getElementAt(index); box.setSelected(!box.isSelected()); repaint(); } @@ -97,7 +125,8 @@ public void mouseMoved(final MouseEvent evt) { final int index = locationToIndex(evt.getPoint()); if (index != -1) { - final JCheckBox box = (JCheckBox)getModel().getElementAt(index); + final JCheckBox box = + (JCheckBox)getModel().getElementAt(index); final List examples = rules.getRule(box).getExamples(); final StringBuffer examplesBuffer = new StringBuffer(); if (!examples.isEmpty()) { @@ -107,9 +136,9 @@ } String example = examplesBuffer.toString(); - while (example.charAt(0) == '\r' || - example.charAt(0) == '\n' || - example.charAt(0) == '\t' || + while (example.charAt(0) == '\r' || + example.charAt(0) == '\n' || + example.charAt(0) == '\t' || example.charAt(0) == ' ') { example = example.substring(1); } @@ -120,18 +149,18 @@ } private class CheckboxListCellRenderer implements ListCellRenderer { - public Component getListCellRendererComponent(final JList list, - final Object value, - final int index, - final boolean isSelected, + public Component getListCellRendererComponent(final JList list, + final Object value, + final int index, + final boolean isSelected, final boolean cellHasFocus) { final JCheckBox box = (JCheckBox)value; box.setEnabled(isEnabled()); box.setFont(getFont()); box.setFocusPainted(false); box.setBorderPainted(true); - box.setBorder(isSelected ? - UIManager.getBorder("List.focusCellHighlightBorder") : + box.setBorder(isSelected ? + UIManager.getBorder("List.focusCellHighlightBorder") : new EmptyBorder(1, 1, 1, 1)); return box; } @@ -145,19 +174,30 @@ } } - public static final String STORED_SEPARATELY = - "pmd.settings.separate"; - public static final String SEL_FILENAME = - "pmd.settings.separate.name"; + public static final String STORED_SEPARATELY = "pmd.settings.separate"; + public static final String SEL_FILENAME = "pmd.settings.separate.name"; private final transient JTextArea exampleTextArea = new JTextArea(10, 50); + private JCheckBox selectedRulesStoredSeparatelyBox; + private JTextField selectedRulesSeparateFileNameField = new JTextField(30); private transient SelectedRules rules; private transient JList rulesList; + private static FileStorage pluginProps = + new FileStorage(new File(Version.getJdevHome() + PLUGIN_PROPS)); public static SettingsStorage createSettingsStorage() { - return new IDEStorage(); + try { + if (Boolean.valueOf(pluginProps.load(STORED_SEPARATELY)).booleanValue()) { + return new FileStorage(new File(pluginProps.load(SEL_FILENAME))); + } + } catch (SettingsException se) { + Util.logMessage(se.getStackTrace()); + Util.showError(se, Plugin.PMD_TITLE); + } + return new FileStorage(new File(Version.getJdevHome() + RULE_PROPS)); } + public void onEntry(final TraversableContext tcon) { removeAll(); try { @@ -167,7 +207,15 @@ Util.showError(rsne, Plugin.PMD_TITLE); } + try { + selectedRulesStoredSeparatelyBox = + new JCheckBox("", Boolean.valueOf(pluginProps.load(STORED_SEPARATELY)).booleanValue()); + } catch (SettingsException se) { + Util.logMessage(se.getStackTrace()); + Util.showError(se, Plugin.PMD_TITLE); + } final JPanel mainPanel = new JPanel(new BorderLayout()); + mainPanel.add(createTopPanel(), BorderLayout.NORTH); mainPanel.add(createRulesSelectionPanel(), BorderLayout.SOUTH); add(mainPanel); } @@ -177,22 +225,23 @@ checkBoxesPanel.setBorder(BorderFactory.createTitledBorder("Rules")); rulesList = new CheckboxList(rules.getAllBoxes()); rulesList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); + rulesList.setVisibleRowCount(5); checkBoxesPanel.add(new JScrollPane(rulesList), BorderLayout.NORTH); final JPanel buttonsPanel = new JPanel(); buttonsPanel.setLayout(new BoxLayout(buttonsPanel, BoxLayout.Y_AXIS)); final JButton selectAll = new JButton("Select all"); selectAll.addActionListener(new ActionListener() { - public void actionPerformed(final ActionEvent evt) { - setSelected(true); - } - }); + public void actionPerformed(final ActionEvent evt) { + setSelected(true); + } + }); buttonsPanel.add(selectAll); final JButton selectNone = new JButton("Deselect all"); selectNone.addActionListener(new ActionListener() { - public void actionPerformed(final ActionEvent evt) { - setSelected(false); - } - }); + public void actionPerformed(final ActionEvent evt) { + setSelected(false); + } + }); buttonsPanel.add(selectNone); final JButton importButton = new JButton("Import rules file"); importButton.addActionListener(new ImportListener()); @@ -211,27 +260,63 @@ return rulesSelPanel; } - private void setSelected(final Boolean selected) { - final ListModel model = rulesList.getModel(); - for (int i = 0; i < model.getSize(); i++) { - final JCheckBox box = (JCheckBox)model.getElementAt(i); - box.setSelected(selected); + private JPanel createTopPanel() { + + try { + selectedRulesSeparateFileNameField.setText(pluginProps.load(SEL_FILENAME)); + selectedRulesStoredSeparatelyBox.setSelected(Boolean.valueOf(pluginProps.load(STORED_SEPARATELY)).booleanValue()); + } catch (SettingsException se) { + Util.logMessage(se.getStackTrace()); + Util.showError(se, Plugin.PMD_TITLE); } - rulesList.repaint(); + JPanel topPanel = new JPanel(new BorderLayout()); + JPanel customStoragePanel = new JPanel(new BorderLayout()); + customStoragePanel.setBorder(BorderFactory.createTitledBorder("Settings storage")); + + JPanel customStorageCheckBoxPanel = new JPanel(); + customStorageCheckBoxPanel.add(new JLabel("Use centrally managed rule settings?")); + customStorageCheckBoxPanel.add(selectedRulesStoredSeparatelyBox); + customStoragePanel.add(customStorageCheckBoxPanel, BorderLayout.NORTH); + + JPanel customStorageTextFieldPanel = new JPanel(); + customStorageTextFieldPanel.add(new JLabel("File:")); + customStorageTextFieldPanel.add(selectedRulesSeparateFileNameField); + JButton findButton = new JButton("Find file"); + findButton.addActionListener(new FindListener()); + customStorageTextFieldPanel.add(findButton); + + customStoragePanel.add(customStorageTextFieldPanel, + BorderLayout.SOUTH); + topPanel.add(customStoragePanel, BorderLayout.CENTER); + return topPanel; } public void onExit(final TraversableContext tcon) { + final Properties properties = new Properties(); + properties.setProperty(STORED_SEPARATELY, + String.valueOf(selectedRulesStoredSeparatelyBox.isSelected())); + properties.setProperty(SEL_FILENAME, + selectedRulesSeparateFileNameField.getText()); try { + pluginProps.save(properties); rules.save(createSettingsStorage()); } catch (SettingsException se) { - JOptionPane.showMessageDialog(null, - "Can't save selected rules to the file :" + - se.getMessage(), - "Can't save settings", + JOptionPane.showMessageDialog(null, + "Can't save settings :" + se.getMessage(), + "Can't save settings", JOptionPane.ERROR_MESSAGE); } } + private void setSelected(final Boolean selected) { + final ListModel model = rulesList.getModel(); + for (int i = 0; i < model.getSize(); i++) { + final JCheckBox box = (JCheckBox)model.getElementAt(i); + box.setSelected(selected); + } + rulesList.repaint(); + } + private void importFile(final String fileLocation) { final RuleSetFactory factory = new RuleSetFactory(); RuleSets ruleSets = null; @@ -255,9 +340,10 @@ rulesList.repaint(); } - private Boolean isRuleAvailabel(final Set<Rule> allRules, final Rule requestedRule) { + private Boolean isRuleAvailabel(final Set<Rule> allRules, + final Rule requestedRule) { Boolean returnValue = Boolean.FALSE; - for (Rule rule: allRules) { + for (Rule rule : allRules) { if (rule.getName().equals(requestedRule.getName())) { returnValue = Boolean.TRUE; } Modified: trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/Version.java =================================================================== --- trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/Version.java 2009-10-17 13:29:11 UTC (rev 6990) +++ trunk/pmd-jdeveloper.11.1.1/src/net/sourceforge/pmd/jdeveloper/Version.java 2009-10-17 13:29:47 UTC (rev 6991) @@ -5,13 +5,17 @@ import oracle.ide.Context; +import oracle.ide.Ide; + import oracle.jdeveloper.compiler.BuildSystemConfiguration; final class Version { private Version() { } + public static void setJavaVersion(final Context context, final PMD pmd) { - final BuildSystemConfiguration config = BuildSystemConfiguration.getInstance(context.getProject()); + final BuildSystemConfiguration config = + BuildSystemConfiguration.getInstance(context.getProject()); final String source = config.getSource(); if ("1.6".equals(source)) { pmd.setJavaVersion(SourceType.JAVA_16); @@ -25,7 +29,10 @@ } public static String version() { - return "4.2.4.3.0"; + return "4.2.5.3.0"; } + static String getJdevHome() { + return Ide.getProductHomeDirectory(); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Pmd-devel mailing list Pmd-devel@... https://lists.sourceforge.net/lists/listinfo/pmd-devel |
| Free embeddable forum powered by Nabble | Forum Help |