JBoss Tools SVN: r22521 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-03 17:17:39 -0400 (Thu, 03 Jun 2010)
New Revision: 22521
Modified:
trunk/parent-pom.xml
Log:
add <surefire.timeout>900</surefire.timeout> to hopefully not hang so long in badly written tests like org.jboss.ide.eclipse.archives.test
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-06-03 21:17:03 UTC (rev 22520)
+++ trunk/parent-pom.xml 2010-06-03 21:17:39 UTC (rev 22521)
@@ -87,6 +87,8 @@
<artifactId>maven-osgi-test-plugin</artifactId>
<version>${tychoVersion}</version>
<configuration>
+ <!-- timeout in seconds -->
+ <surefire.timeout>900</surefire.timeout>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
<!-- https://docs.sonatype.org/display/TYCHO/How+to+run+SWTBot+tests+with+Tycho -->
14 years, 7 months
JBoss Tools SVN: r22520 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-03 17:17:03 -0400 (Thu, 03 Jun 2010)
New Revision: 22520
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java
Log:
https://jira.jboss.org/browse/JBIDE-6409 Externalize strings for org.jboss.tools.jsf.ui.editor.check package
Switched to use MessageFormat class to apply parameters to string instead of string concatenation
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2010-06-03 21:13:17 UTC (rev 22519)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/JSFNaturesInfoDialog.java 2010-06-03 21:17:03 UTC (rev 22520)
@@ -11,6 +11,8 @@
package org.jboss.tools.jsf.ui.editor.check;
+import java.text.MessageFormat;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.custom.BusyIndicator;
@@ -45,10 +47,10 @@
@Override
protected String getMessageInfo() {
- String dialogMessage = "JBoss Tools Editor might not fully work in project \"" + project.getName() + //$NON-NLS-1$
+ String dialogMessage = MessageFormat.format("JBoss Tools Editor might not fully work in project \"{0}" + //$NON-NLS-1$
"\" because it does not have JSF and code completion enabled completely.\n\n" //$NON-NLS-1$
+ "Please use the Configure menu on the project or \"Add JSF Capabilities...\" fix button to enable JSF if " //$NON-NLS-1$
- + "you want all features of the editor working."; //$NON-NLS-1$
+ + "you want all features of the editor working.",project.getName()); //$NON-NLS-1$
return dialogMessage;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2010-06-03 21:13:17 UTC (rev 22519)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/KBNaturesInfoDialog.java 2010-06-03 21:17:03 UTC (rev 22520)
@@ -11,6 +11,7 @@
package org.jboss.tools.jsf.ui.editor.check;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -94,10 +95,10 @@
@Override
protected String getMessageInfo() {
- String dialogMessage = "The project \"" + project.getName() + //$NON-NLS-1$
+ String dialogMessage = MessageFormat.format("The project \"{0}" + //$NON-NLS-1$
"\" does not have JSF code completion and validation enabled completely.\n\n" //$NON-NLS-1$
+ "Please use \"Enabale JSF Code Completion...\" fix button if " //$NON-NLS-1$
- + "you want these features working."; //$NON-NLS-1$
+ + "you want these features working.",project.getName()); //$NON-NLS-1$
return dialogMessage;
}
14 years, 7 months
JBoss Tools SVN: r22517 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-06-03 15:35:40 -0400 (Thu, 03 Jun 2010)
New Revision: 22517
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml
Log:
there is no reason to have eclipse-test-plugin for now, because it should be executed on top of fully installed JBossTools or it fails.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2010-06-03 17:26:41 UTC (rev 22516)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2010-06-03 19:35:40 UTC (rev 22517)
@@ -10,5 +10,5 @@
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.jsf.ui.bot.test</artifactId>
<version>3.1.0-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
+ <packaging>eclipse-plugin</packaging>
</project>
14 years, 7 months
JBoss Tools SVN: r22516 - tags.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-06-03 13:26:41 -0400 (Thu, 03 Jun 2010)
New Revision: 22516
Added:
tags/jbosstools-3.1.1.GA/
Log:
tag as 3.1.1.GA
Copied: tags/jbosstools-3.1.1.GA (from rev 22515, branches/jbosstools-3.1.x)
14 years, 7 months
JBoss Tools SVN: r22515 - in workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-06-03 12:38:52 -0400 (Thu, 03 Jun 2010)
New Revision: 22515
Added:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/jaxen-1.1.1.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-SNAPSHOT.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-SNAPSHOT.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-SNAPSHOT.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/mvel2-2.0.17.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/xstream-1.2.2.jar
Removed:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.2.1.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.2.1.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.2.1.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.2.1.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.2.1.jar
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.2.1.jar
Modified:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/.classpath
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties
Log:
https://jira.jboss.org/browse/JBIDE-6408
Update to use Smooks v1.4 in the runtime module
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/.classpath
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-03 14:28:16 UTC (rev 22514)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-03 16:38:52 UTC (rev 22515)
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="libs/jaxen-1.1.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-commons-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-edisax-parser-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-core-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-csv-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-edi-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-json-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/mvel2-2.0.17.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/xstream-1.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="libs/freemarker-2.3.11.jar"/>
<classpathentry exported="true" kind="lib" path="libs/opencsv-1.8.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jackson-core-lgpl-1.0.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-commons-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-edisax-parser-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-core-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-csv-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-edi-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-json-1.2.1.jar" sourcepath="/Users/tfennelly/milyn/trunk/smooks-cartridges/json/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-03 14:28:16 UTC (rev 22514)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-03 16:38:52 UTC (rev 22515)
@@ -14,14 +14,18 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .,
libs/jackson-core-lgpl-1.0.1.jar,
- libs/milyn-commons-1.2.1.jar,
- libs/milyn-edisax-parser-1.2.1.jar,
- libs/milyn-smooks-core-1.2.1.jar,
- libs/milyn-smooks-csv-1.2.1.jar,
- libs/milyn-smooks-edi-1.2.1.jar,
- libs/milyn-smooks-json-1.2.1.jar,
libs/opencsv-1.8.jar,
- libs/freemarker-2.3.11.jar
+ libs/freemarker-2.3.11.jar,
+ libs/jaxen-1.1.1.jar,
+ libs/milyn-commons-1.4-SNAPSHOT.jar,
+ libs/milyn-edisax-parser-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-core-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-csv-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-edi-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-json-1.4-SNAPSHOT.jar,
+ libs/mvel2-2.0.17.jar,
+ libs/xstream-1.2.2.jar
Bundle-Localization: plugin
Bundle-Vendor: %providerName
Export-Package: au.com.bytecode.opencsv,
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-03 14:28:16 UTC (rev 22514)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-03 16:38:52 UTC (rev 22515)
@@ -1,13 +1,17 @@
bin.includes = META-INF/,\
libs/jackson-core-lgpl-1.0.1.jar,\
- libs/milyn-commons-1.2.1.jar,\
- libs/milyn-edisax-parser-1.2.1.jar,\
- libs/milyn-smooks-core-1.2.1.jar,\
- libs/milyn-smooks-csv-1.2.1.jar,\
- libs/milyn-smooks-edi-1.2.1.jar,\
- libs/milyn-smooks-json-1.2.1.jar,\
libs/opencsv-1.8.jar,\
plugin.properties,\
libs/freemarker-2.3.11.jar,\
- about.html
+ about.html,\
+ libs/jaxen-1.1.1.jar,\
+ libs/milyn-commons-1.4-SNAPSHOT.jar,\
+ libs/milyn-edisax-parser-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-core-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-csv-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-edi-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-json-1.4-SNAPSHOT.jar,\
+ libs/mvel2-2.0.17.jar,\
+ libs/xstream-1.2.2.jar
jars.compile.order =
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml (rev 0)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml 2010-06-03 16:38:52 UTC (rev 22515)
@@ -0,0 +1,68 @@
+<project name="Get-Smooks" default="smooks.dependencies.get" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+
+ <property name="smooks.version" value="1.4-SNAPSHOT"/>
+
+ <description>
+ Script for pulling Smooks v${smooks.version} jars from the maven repo.
+ </description>
+
+ <property environment="env"/>
+ <property name="maven.ant.version" value="2.0.9"/>
+ <property name="maven.dir" value="org/apache/maven/maven-ant-tasks/${maven.ant.version}"/>
+ <property name="maven.jar" value="maven-ant-tasks-${maven.ant.version}.jar"/>
+ <pathconvert targetos="unix" property="maven.repo.dir">
+ <path>
+ <pathelement location="${user.home}/.m2/repository"/>
+ </path>
+ </pathconvert>
+ <pathconvert targetos="unix" property="maven.ant.repo.dir">
+ <path>
+ <pathelement location="${maven.repo.dir}/${maven.dir}"/>
+ </path>
+ </pathconvert>
+ <condition property="maven.exists.locally">
+ <available file="${maven.ant.repo.dir}/${maven.jar}"/>
+ </condition>
+
+ <target name="smooks.dependencies.get" depends="maven.get">
+
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpath="${maven.ant.repo.dir}/${maven.jar}"/>
+ <artifact:remoteRepository id="codehaus.m2.snapshots" url="http://snapshots.repository.codehaus.org" />
+ <artifact:dependencies filesetId="dependencies">
+
+ <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-csv" />
+ <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-edi" />
+ <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-javabean"/>
+ <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-json"/>
+
+ <remoteRepository refid="codehaus.m2.snapshots" />
+ </artifact:dependencies>
+
+ <tstamp>
+ <format property="get.time" pattern="MM-dd-yyyy-hh-mm-ss"/>
+ </tstamp>
+
+ <property name="todir" value="libs" />
+ <antcall target="copy.dependencies">
+ <reference refid="dependencies" />
+ </antcall>
+ <delete>
+ <fileset dir="./${todir}" includes="commons*.jar,jta*.jar,xerces*.jar,xpp*.jar,xml-apis*.jar,junit*,log4j*,hsqldb*,servlet-api*,xalan*,jbossall-client*,jboss-j2ee*,jdom*,cglib-full*,cglib-nodep*,struts*,mockejb*,mockrunner*,commons-beanutils*,commons-digester*,commons-fileupload*,commons-validator*,oro*,xmlunit*,hibernate-core-*,ibatis-sqlmap-*,dom4j-*,ant-*,javassist-3.10.0.GA.jar" />
+ </delete>
+ </target>
+
+ <target name="maven.get" unless="maven.exists.locally">
+ <mkdir dir="${maven.ant.repo.dir}"/>
+ <get src="http://repo1.maven.org/maven2/${maven.dir}/${maven.jar}" dest="${maven.ant.repo.dir}/${maven.jar}"
+ usetimestamp="true"/>
+ </target>
+
+ <target name="copy.dependencies">
+ <mkdir dir="./${todir}" />
+ <copy todir="./${todir}">
+ <fileset refid="dependencies"/>
+ <mapper type="flatten"/>
+ </copy>
+ </target>
+
+</project>
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/jaxen-1.1.1.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/jaxen-1.1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.2.1.jar
===================================================================
(Binary files differ)
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.2.1.jar
===================================================================
(Binary files differ)
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.2.1.jar
===================================================================
(Binary files differ)
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.2.1.jar
===================================================================
(Binary files differ)
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.2.1.jar
===================================================================
(Binary files differ)
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.2.1.jar
===================================================================
(Binary files differ)
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/mvel2-2.0.17.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/mvel2-2.0.17.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/xstream-1.2.2.jar
===================================================================
(Binary files differ)
Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/xstream-1.2.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 7 months
JBoss Tools SVN: r22514 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-03 10:28:16 -0400 (Thu, 03 Jun 2010)
New Revision: 22514
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationMemberDefinition.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/QualifierElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
https://jira.jboss.org/browse/JBIDE-6401
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java 2010-06-03 13:32:55 UTC (rev 22513)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IQualifier.java 2010-06-03 14:28:16 UTC (rev 22514)
@@ -10,11 +10,21 @@
******************************************************************************/
package org.jboss.tools.cdi.core;
+import java.util.Set;
+
+import org.eclipse.jdt.core.IMethod;
+
/**
* Represents an interceptor binding type.
*
* @author Viacheslav Kabanovich
*/
public interface IQualifier extends ICDIAnnotation {
-
+
+ /**
+ * Returns set of members annotated with @Nonbinding
+ *
+ * @return set of members annotated with @Nonbinding
+ */
+ public Set<IMethod> getNonBindingMethods();
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-06-03 13:32:55 UTC (rev 22513)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-06-03 14:28:16 UTC (rev 22514)
@@ -317,7 +317,7 @@
return false;
}
- public static boolean areMatchingQualifiers(Set<? extends IAnnotationDeclaration> beanQualifiers, Set<? extends IAnnotationDeclaration> injectionQualifiers) throws CoreException {
+ public static boolean areMatchingQualifiers(Set<IQualifierDeclaration> beanQualifiers, Set<IQualifierDeclaration> injectionQualifiers) throws CoreException {
if(beanQualifiers == null || beanQualifiers.isEmpty()) {
if(injectionQualifiers == null || injectionQualifiers.isEmpty()) {
return true;
@@ -325,7 +325,7 @@
}
TreeSet<String> injectionKeys = new TreeSet<String>();
- if(injectionQualifiers != null) for (IAnnotationDeclaration d: injectionQualifiers) {
+ if(injectionQualifiers != null) for (IQualifierDeclaration d: injectionQualifiers) {
injectionKeys.add(getQualifierDeclarationKey(d));
}
@@ -339,7 +339,7 @@
TreeSet<String> beanKeys = new TreeSet<String>();
if(beanQualifiers == null || beanQualifiers.isEmpty()) {
beanKeys.add(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME);
- } else for (IAnnotationDeclaration d: beanQualifiers) {
+ } else for (IQualifierDeclaration d: beanQualifiers) {
beanKeys.add(getQualifierDeclarationKey(d));
}
if(beanKeys.size() == 1 && beanKeys.iterator().next().startsWith(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)) {
@@ -359,7 +359,7 @@
* @return
* @throws CoreException
*/
- public static boolean areMatchingQualifiers(Set<? extends IAnnotationDeclaration> beanQualifiers, IType... injectionQualifiers) throws CoreException {
+ public static boolean areMatchingQualifiers(Set<IQualifierDeclaration> beanQualifiers, IType... injectionQualifiers) throws CoreException {
if(beanQualifiers == null || beanQualifiers.isEmpty()) {
if(injectionQualifiers == null || injectionQualifiers.length == 0) {
return true;
@@ -394,7 +394,9 @@
return true;
}
- public static String getQualifierDeclarationKey(IAnnotationDeclaration d) throws CoreException {
+ public static String getQualifierDeclarationKey(IQualifierDeclaration d) throws CoreException {
+ IQualifier q = d.getQualifier();
+ Set<IMethod> nb = q == null ? new HashSet<IMethod>() : q.getNonBindingMethods();
IType type = d.getType();
IMethod[] ms = type.getMethods();
StringBuffer result = new StringBuffer();
@@ -411,7 +413,13 @@
}
for (IMethod m: ms) {
String n = m.getElementName();
- if(values.containsKey(n)) continue;
+ if(nb.contains(m)) {
+ values.remove(n);
+ continue;
+ }
+ if(values.containsKey(n)) {
+ continue;
+ }
IMemberValuePair p = m.getDefaultValue();
n = p.getMemberName();
Object o = p.getValue();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/QualifierElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/QualifierElement.java 2010-06-03 13:32:55 UTC (rev 22513)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/QualifierElement.java 2010-06-03 14:28:16 UTC (rev 22514)
@@ -10,7 +10,13 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.jdt.core.IMethod;
import org.jboss.tools.cdi.core.IQualifier;
+import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationMemberDefinition;
/**
*
@@ -18,7 +24,23 @@
*
*/
public class QualifierElement extends CDIAnnotationElement implements IQualifier {
+ Set<IMethod> nonbindingMethods = null;
public QualifierElement() {}
+ public Set<IMethod> getNonBindingMethods() {
+ if(nonbindingMethods == null) {
+ Set<IMethod> result = new HashSet<IMethod>();
+ List<AnnotationMemberDefinition> ms = definition.getMethods();
+ for (AnnotationMemberDefinition m: ms) {
+ if(m.getNonbindingAnnotation() != null) {
+ result.add(m.getMethod());
+ }
+ }
+ nonbindingMethods = result;
+ }
+ return nonbindingMethods;
+
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-06-03 13:32:55 UTC (rev 22513)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-06-03 14:28:16 UTC (rev 22514)
@@ -21,9 +21,7 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.internal.core.SourceRange;
import org.jboss.tools.cdi.core.IParametedType;
-import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.impl.ParametedType;
-import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration;
import org.jboss.tools.common.util.FileUtil;
/**
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java 2010-06-03 13:32:55 UTC (rev 22513)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java 2010-06-03 14:28:16 UTC (rev 22514)
@@ -10,10 +10,13 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
@@ -35,6 +38,8 @@
protected int kind = NON_RELEVANT;
+ List<AnnotationMemberDefinition> methods = new ArrayList<AnnotationMemberDefinition>();
+
public AnnotationDefinition() {}
public void setKind(int kind) {
@@ -45,6 +50,10 @@
return kind;
}
+ public List<AnnotationMemberDefinition> getMethods() {
+ return methods;
+ }
+
@Override
protected void init(IType contextType, DefinitionContext context) throws CoreException {
super.init(contextType, context);
@@ -73,8 +82,24 @@
} else if(AnnotationHelper.CDI_ANNOTATION_TYPES.contains(qualifiedName)) {
kind = AnnotationDefinition.CDI;
}
+
+ if(kind == QUALIFIER) {
+ initMemberDefinitions(contextType, context);
+ }
}
+ void initMemberDefinitions(IType contextType, DefinitionContext context) throws CoreException {
+ IMethod[] ms = getType().getMethods();
+ for (int i = 0; i < ms.length; i++) {
+ AnnotationMemberDefinition m = new AnnotationMemberDefinition();
+ m.setAnnotationDefinition(this);
+ m.setMethod(ms[i], context);
+ if(m.isCDIAnnotated()) {
+ methods.add(m);
+ }
+ }
+ }
+
public AnnotationDeclaration getInheritedAnnotation() {
return annotationsByType.get(CDIConstants.INHERITED_ANNOTATION_TYPE_NAME);
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationMemberDefinition.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationMemberDefinition.java 2010-06-03 14:28:16 UTC (rev 22514)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.internal.core.impl.definition;
+
+import org.eclipse.jdt.core.IMethod;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class AnnotationMemberDefinition extends AbstractMemberDefinition {
+ AnnotationDefinition annotationDefinition;
+ IMethod method;
+
+ public AnnotationMemberDefinition() {}
+
+ public void setAnnotationDefinition(AnnotationDefinition annotationDefinition) {
+ this.annotationDefinition = annotationDefinition;
+ }
+
+ public AnnotationDefinition getTypeDefinition() {
+ return annotationDefinition;
+ }
+
+ public void setMethod(IMethod method, DefinitionContext context) {
+ this.method = method;
+ setAnnotatable(method, method.getDeclaringType(), context);
+ }
+
+ public IMethod getMethod() {
+ return method;
+ }
+
+ public boolean isCDIAnnotated() {
+ return getNonbindingAnnotation() != null;
+ }
+
+ public AnnotationDeclaration getNonbindingAnnotation() {
+ return annotationsByType.get(CDIConstants.NON_BINDING_ANNOTATION_TYPE_NAME);
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationMemberDefinition.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2010-06-03 13:32:55 UTC (rev 22513)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2010-06-03 14:28:16 UTC (rev 22514)
@@ -11,8 +11,6 @@
package org.jboss.tools.cdi.internal.core.impl.definition;
import org.eclipse.jdt.core.IField;
-import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
/**
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2010-06-03 13:32:55 UTC (rev 22513)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2010-06-03 14:28:16 UTC (rev 22514)
@@ -10,7 +10,6 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.internal.core.impl.ParametedType;
import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-03 13:32:55 UTC (rev 22513)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-06-03 14:28:16 UTC (rev 22514)
@@ -1393,7 +1393,7 @@
String returnTypeSignature = method.getReturnType();
int kind = Signature.getTypeSignatureKind(returnTypeSignature);
if(kind == Signature.ARRAY_TYPE_SIGNATURE) {
- if(!CDIUtil.hasNonBindingAnnotationDeclaration(type, method)) {
+ if(!qualifier.getNonBindingMethods().contains(method)) {
ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange());
addError(CDIValidationMessages.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER, CDIPreferences.MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER, reference, qualifier.getResource());
}
14 years, 7 months
JBoss Tools SVN: r22513 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: jsf2/refactoring/action/rename and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-06-03 09:32:55 -0400 (Thu, 03 Jun 2010)
New Revision: 22513
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringActionManager.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/CompositeAttributeRenameProcessor.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/CompositeAttributeRenameRefactoringWizard.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/RenameAction.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-5943 fixed messages
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringActionManager.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringActionManager.java 2010-06-03 13:24:50 UTC (rev 22512)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringActionManager.java 2010-06-03 13:32:55 UTC (rev 22513)
@@ -14,6 +14,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.jboss.tools.jsf.jsf2.refactoring.action.rename.IRenameDescriptor;
import org.jboss.tools.jsf.jsf2.refactoring.action.rename.RenameUserInterfaceManager;
+import org.jboss.tools.jsf.messages.JSFUIMessages;
@SuppressWarnings("restriction")
public class RefactoringActionManager {
@@ -56,7 +57,7 @@
if (descriptor == null) {
MessageDialog.openInformation(parent,
RefactoringMessages.RenameAction_rename,
- "Refactoring is not available in the current place"); //$NON-NLS-1$
+ JSFUIMessages.Refactoring_JSF_2_Isnt_Available);
return;
}
descriptor.getRenameRefactoring().setProcessor(
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/CompositeAttributeRenameProcessor.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/CompositeAttributeRenameProcessor.java 2010-06-03 13:24:50 UTC (rev 22512)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/CompositeAttributeRenameProcessor.java 2010-06-03 13:32:55 UTC (rev 22513)
@@ -24,6 +24,7 @@
import org.jboss.tools.jsf.jsf2.refactoring.core.StructuredChanges;
import org.jboss.tools.jsf.jsf2.refactoring.core.StructuredTextFileChange;
import org.jboss.tools.jsf.jsf2.util.JSF2ComponentUtil;
+import org.jboss.tools.jsf.messages.JSFUIMessages;
import org.w3c.dom.Attr;
import org.eclipse.ltk.core.refactoring.GroupCategory;
import org.eclipse.text.edits.ReplaceEdit;
@@ -38,7 +39,7 @@
private static final Pattern PATTERN = Pattern.compile("[a-zA-Z_][a-zA-Z0-9_.]*+"); //$NON-NLS-1$
private static final GroupCategorySet CATEGORY_COMPOSITE_ATTR_RENAME = new GroupCategorySet(
new GroupCategory(
- "org.jboss.tools.jsf.jsf2.refactoring.rename.composite.attr.type", "Rename composite attribute changes", "Changes to rename composite attribute")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "org.jboss.tools.jsf.jsf2.refactoring.rename.composite.attr.type", JSFUIMessages.Refactoring_JSF_2_Rename_Composite_Attr_Changes, JSFUIMessages.Refactoring_JSF_2_Changes_Rename_Composite_Attr)); //$NON-NLS-1$
public static String IDENTIFIER = "org.jboss.tools.jsf.jsf2.refactor.compositeattrrenameprocessor"; //$NON-NLS-1$
private String newAttrName;
private String currentAttrName;
@@ -72,10 +73,10 @@
public Change createChange(IProgressMonitor pm) throws CoreException,
OperationCanceledException {
StructuredChanges changes = new StructuredChanges(
- "Composite attribute name changes"); //$NON-NLS-1$
+ JSFUIMessages.Refactoring_JSF_2_Composite_Attr_Rename_Changes);
StructuredTextFileChange baseFileChange = new StructuredTextFileChange(baseFile.getFullPath().toOSString(), baseFile);
ReplaceEdit edit = new ReplaceEdit(attrToRename.getValueRegionStartOffset()+1, attrToRename.getValue().length(), getNewElementName());
- TextChangeCompatibility.addTextEdit(baseFileChange, "Rename composite attribute name", edit, CATEGORY_COMPOSITE_ATTR_RENAME); //$NON-NLS-1$
+ TextChangeCompatibility.addTextEdit(baseFileChange, JSFUIMessages.Refactoring_JSF_2_Rename_Composite_Attr_Name, edit, CATEGORY_COMPOSITE_ATTR_RENAME);
changes.add(baseFileChange);
Map<IFile, List<IDOMNode>> nodesMap = JSF2ComponentUtil
.findCompositeComponentsWithURI(getProject(), getURI());
@@ -109,7 +110,7 @@
TextChangeCompatibility
.addTextEdit(
fileChange,
- "Rename Compoiste Attribute", edit, CATEGORY_COMPOSITE_ATTR_RENAME); //$NON-NLS-1$
+ JSFUIMessages.Refactoring_JSF_2_Rename_Composite_Attr, edit, CATEGORY_COMPOSITE_ATTR_RENAME);
}
}
}
@@ -128,7 +129,7 @@
@Override
public String getProcessorName() {
- return "Rename Composite Attribute"; //$NON-NLS-1$
+ return JSFUIMessages.Refactoring_JSF_2_Rename_Composite_Attr;
}
@Override
@@ -153,7 +154,7 @@
matchString = matcher.group();
}
if (includings != 1 || !matchString.equals(getNewElementName())) {
- status = RefactoringStatus.createFatalErrorStatus("Attribute name is not valid"); //$NON-NLS-1$
+ status = RefactoringStatus.createFatalErrorStatus(JSFUIMessages.Refactoring_JSF_2_Invalid_Attr);
}
return status;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/CompositeAttributeRenameRefactoringWizard.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/CompositeAttributeRenameRefactoringWizard.java 2010-06-03 13:24:50 UTC (rev 22512)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/CompositeAttributeRenameRefactoringWizard.java 2010-06-03 13:32:55 UTC (rev 22513)
@@ -3,6 +3,7 @@
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
import org.eclipse.ltk.core.refactoring.Refactoring;
+import org.jboss.tools.jsf.messages.JSFUIMessages;
@SuppressWarnings("restriction")
public class CompositeAttributeRenameRefactoringWizard extends
@@ -10,8 +11,8 @@
public CompositeAttributeRenameRefactoringWizard(Refactoring refactoring) {
super(refactoring,
- "Rename Composite Attribute", //$NON-NLS-1$
- "Enter New Name for Composite Attribute", //$NON-NLS-1$
+ JSFUIMessages.Refactoring_JSF_2_Rename_Composite_Attribute,
+ JSFUIMessages.Refactoring_JSF_2_Rename_Enter_New_Name,
JavaPluginImages.DESC_WIZBAN_REFACTOR,
IJavaHelpContextIds.RENAME_LOCAL_VARIABLE_WIZARD_PAGE);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/RenameAction.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/RenameAction.java 2010-06-03 13:24:50 UTC (rev 22512)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/action/rename/RenameAction.java 2010-06-03 13:32:55 UTC (rev 22513)
@@ -16,6 +16,7 @@
import org.jboss.tools.common.text.ext.IMultiPageEditor;
import org.jboss.tools.jsf.jsf2.refactoring.RefactoringActionFactory;
import org.jboss.tools.jsf.jsf2.refactoring.RefactoringActionManager;
+import org.jboss.tools.jsf.messages.JSFUIMessages;
@SuppressWarnings("restriction")
public class RenameAction extends AbstractHandler implements
@@ -73,7 +74,7 @@
MessageDialog.openInformation(PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getShell(),
RefactoringMessages.RenameAction_rename,
- "Refactoring is not available in the current place"); //$NON-NLS-1$
+ JSFUIMessages.Refactoring_JSF_2_Rename_Action);
}
}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java 2010-06-03 13:24:50 UTC (rev 22512)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/JSFUIMessages.java 2010-06-03 13:32:55 UTC (rev 22513)
@@ -130,6 +130,16 @@
public static String Create_JSF_2_Resources_Folder;
public static String Rename_JSF_2_Composite_Components;
public static String Refactoring_JSF_2_resources;
+ public static String Refactoring_JSF_2_Rename_Action;
+ public static String Refactoring_JSF_2_Rename_Composite_Attribute;
+ public static String Refactoring_JSF_2_Rename_Enter_New_Name;
+ public static String Refactoring_JSF_2_Rename_Composite_Attr_Changes;
+ public static String Refactoring_JSF_2_Changes_Rename_Composite_Attr;
+ public static String Refactoring_JSF_2_Composite_Attr_Rename_Changes;
+ public static String Refactoring_JSF_2_Rename_Composite_Attr_Name;
+ public static String Refactoring_JSF_2_Rename_Composite_Attr;
+ public static String Refactoring_JSF_2_Invalid_Attr;
+ public static String Refactoring_JSF_2_Isnt_Available;
static {
// load message values from bundle file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2010-06-03 13:24:50 UTC (rev 22512)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2010-06-03 13:32:55 UTC (rev 22513)
@@ -106,4 +106,14 @@
Missing_JSF_2_Resources_Folder=Resources folder "{0}" is missing in a project root directory
Create_JSF_2_Resources_Folder=Create a folder container for JSF 2 resources
Rename_JSF_2_Composite_Components=Rename JSF 2 composite components
-Refactoring_JSF_2_resources=Refactoring JSF 2 resources
\ No newline at end of file
+Refactoring_JSF_2_resources=Refactoring JSF 2 resources
+Refactoring_JSF_2_Rename_Action=Refactoring is not available in the current place
+Refactoring_JSF_2_Rename_Composite_Attribute=Rename Composite Attribute
+Refactoring_JSF_2_Rename_Enter_New_Name=Enter New Name for Composite Attribute
+Refactoring_JSF_2_Rename_Composite_Attr_Changes=Rename composite attribute changes
+Refactoring_JSF_2_Changes_Rename_Composite_Attr=Changes to rename composite attribute;
+Refactoring_JSF_2_Composite_Attr_Rename_Changes=Composite attribute name changes
+Refactoring_JSF_2_Rename_Composite_Attr_Name=Rename composite attribute name
+Refactoring_JSF_2_Rename_Composite_Attr=Rename composite attribute
+Refactoring_JSF_2_Invalid_Attr=Attribute name is not valid
+Refactoring_JSF_2_Isnt_Available=Refactoring is not available in the current place
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r22512 - trunk/jsf/plugins/org.jboss.tools.jsf.ui.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-06-03 09:24:50 -0400 (Thu, 03 Jun 2010)
New Revision: 22512
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-6240 - fixed
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-06-03 13:13:41 UTC (rev 22511)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-06-03 13:24:50 UTC (rev 22512)
@@ -450,13 +450,6 @@
class="org.jboss.tools.jsf.ui.el.refactoring.ELRefactorContributionFactory"
locationURI="popup:org.eclipse.ui.popup.any?after=save">
</menuContribution>
- <menuContribution
- locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?after=paste">
- <dynamic
- class="org.jboss.tools.jsf.ui.editor.menu.JSF2CompositionComponentContrubutionItem"
- id="org.jboss.tools.jsf.ui.editor.menu.JSF2CompositionComponentContrubutionItem">
- </dynamic>
- </menuContribution>
</extension>
</plugin>
14 years, 7 months