JBoss Tools SVN: r17834 - in trunk/seam/plugins: org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-10-01 08:33:57 -0400 (Thu, 01 Oct 2009)
New Revision: 17834
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameMethodParticipant.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchQuery.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamELReferencesQueryParticipant.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4771
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-10-01 12:33:10 UTC (rev 17833)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-10-01 12:33:57 UTC (rev 17834)
@@ -50,4 +50,6 @@
public static String SEAM_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE;
public static String SEAM_RENAME_PROCESSOR_LOCATION_NOT_FOUND;
public static String SEAM_RENAME_PROCESSOR_DECLARATION_NOT_FOUND;
+ public static String SEAM_RENAME_METHOD_PARTICIPANT_SETTER_WARNING;
+ public static String SEAM_RENAME_METHOD_PARTICIPANT_GETTER_WARNING;
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2009-10-01 12:33:10 UTC (rev 17833)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2009-10-01 12:33:57 UTC (rev 17834)
@@ -38,4 +38,6 @@
SEAM_RENAME_PROCESSOR_LOCATION_NOT_FOUND=Location for declaration or annotation not found in file: ''{0}''
SEAM_RENAME_PROCESSOR_DECLARATION_NOT_FOUND=Component: ''{0}'' does not have any declarations
SEAM_RENAME_PROCESSOR_ERROR_PHANTOM_FILE=Cannot change phantom file: ''{0}''.
-SEAM_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE=Cannot change read-only file: ''{0}''.
\ No newline at end of file
+SEAM_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE=Cannot change read-only file: ''{0}''.
+SEAM_RENAME_METHOD_PARTICIPANT_SETTER_WARNING=Be sure, may be you also should rename getter method to avoid compilation problems.
+SEAM_RENAME_METHOD_PARTICIPANT_GETTER_WARNING=Be sure, may be you also should rename setter method to avoid compilation problems.
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-10-01 12:33:10 UTC (rev 17833)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-10-01 12:33:57 UTC (rev 17834)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.search.IJavaSearchScope;
import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
@@ -345,7 +346,7 @@
key = false;
if(key && token.startsWith(propertyName)){
- match(file, offset, token.length());
+ match(file, offset, token.length(), true);
}
}
@@ -373,13 +374,13 @@
protected abstract boolean isFileCorrect(IFile file);
- protected abstract void match(IFile file, int offset, int length);
+ protected abstract void match(IFile file, int offset, int length, boolean resolved);
private void checkMatch(IFile file, ELExpression operand, int leftOffset, int offset, int length){
if(javaElement != null && operand != null)
resolve(file, operand, leftOffset, offset, length);
else
- match(file, offset, length);
+ match(file, offset, length, true);
}
public static String getPropertyName(String methodName){
@@ -396,9 +397,21 @@
return methodName;
}
- public static boolean isSetter(String methodName){
- return methodName.startsWith(SET);
+ // TODO: move to util class
+ public boolean isGetter(IMethod method) {
+ String name = method.getElementName();
+ int numberOfParameters = method.getNumberOfParameters();
+
+ return (((name.startsWith(GET) && !name.equals(GET)) || name.startsWith(IS)) && numberOfParameters == 0);
}
+
+ // TODO: move to util class
+ public boolean isSetter(IMethod method) {
+ String name = method.getElementName();
+ int numberOfParameters = method.getNumberOfParameters();
+
+ return ((name.startsWith(SET) && !name.equals(SET)) && numberOfParameters == 1);
+ }
private boolean containsInSearchScope(IProject project){
if(searchScope == null)
@@ -447,8 +460,9 @@
.getProject()))
;
} else if (javaElement.equals(segmentJavaElement))
- match(file, offset, length);
+ match(file, offset, length, true);
}
}
+ match(file, offset, length, false);
}
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameMethodParticipant.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameMethodParticipant.java 2009-10-01 12:33:10 UTC (rev 17833)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameMethodParticipant.java 2009-10-01 12:33:57 UTC (rev 17834)
@@ -43,13 +43,25 @@
private TextFileChange lastChange;
private ArrayList<String> keys = new ArrayList<String>();
+ private static boolean added = false;
+
@Override
public RefactoringStatus checkConditions(IProgressMonitor pm,
CheckConditionsContext context) throws OperationCanceledException {
- if(searcher != null)
- searcher.findELReferences();
+ if(searcher == null)
+ return status;
+ if(method != null && !added){
+ if(searcher.isGetter(method))
+ status.addWarning(SeamCoreMessages.SEAM_RENAME_METHOD_PARTICIPANT_GETTER_WARNING);
+ else if(searcher.isSetter(method))
+ status.addWarning(SeamCoreMessages.SEAM_RENAME_METHOD_PARTICIPANT_SETTER_WARNING);
+ added = true;
+ }
+
+ searcher.findELReferences();
+
return status;
}
@@ -72,13 +84,11 @@
rootChange = new CompositeChange("");
method = (IMethod)element;
- if(!SeamRenameMethodSearcher.isSetter(method.getElementName()))
- return false;
-
oldName = SeamRenameMethodSearcher.getPropertyName(method.getElementName());
newName = SeamRenameMethodSearcher.getPropertyName(getArguments().getNewName());
searcher = new SeamRenameMethodSearcher((IFile)method.getResource(), oldName);
+ added = false;
return true;
}
return false;
@@ -116,7 +126,7 @@
class SeamRenameMethodSearcher extends SeamRefactorSearcher{
public SeamRenameMethodSearcher(IFile file, String name){
- super(file, name);
+ super(file, name, method);
}
@Override
@@ -150,7 +160,7 @@
}
@Override
- protected void match(IFile file, int offset, int length) {
+ protected void match(IFile file, int offset, int length, boolean resolved) {
change(file, offset, length, newName);
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-10-01 12:33:10 UTC (rev 17833)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-10-01 12:33:57 UTC (rev 17834)
@@ -448,7 +448,7 @@
}
@Override
- protected void match(IFile file, int offset, int length) {
+ protected void match(IFile file, int offset, int length, boolean resolved) {
change(file, offset, length, newName);
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchQuery.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchQuery.java 2009-10-01 12:33:10 UTC (rev 17833)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/ELSearchQuery.java 2009-10-01 12:33:57 UTC (rev 17834)
@@ -83,7 +83,7 @@
}
@Override
- protected void match(IFile file, int offset, int length) {
+ protected void match(IFile file, int offset, int length, boolean resolved) {
Match match = new Match(file, offset, length);
result.addMatch(match);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamELReferencesQueryParticipant.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamELReferencesQueryParticipant.java 2009-10-01 12:33:10 UTC (rev 17833)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamELReferencesQueryParticipant.java 2009-10-01 12:33:57 UTC (rev 17834)
@@ -86,7 +86,7 @@
}
@Override
- protected void match(IFile file, int offset, int length) {
+ protected void match(IFile file, int offset, int length, boolean resolved) {
Match match = new Match(file, offset, length);
requestor.reportMatch(match);
}
14 years, 7 months
JBoss Tools SVN: r17833 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-01 08:33:10 -0400 (Thu, 01 Oct 2009)
New Revision: 17833
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4961
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2009-10-01 12:16:43 UTC (rev 17832)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2009-10-01 12:33:10 UTC (rev 17833)
@@ -9,7 +9,7 @@
<hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.jsf.richfaces.hyperlink.jsp.JSPLinkHyperlinkPartitioner"
- class="org.jboss.tools.common.text.ext.hyperlink.jsp.JSPLinkHyperlinkPartitioner">
+ class="org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPLinkHyperlinkPartitioner">
<contentType id="org.eclipse.jst.jsp.core.jspsource">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/[http://richfaces.org/a4j]:include/viewId/" />
14 years, 7 months
JBoss Tools SVN: r17832 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-01 08:16:43 -0400 (Thu, 01 Oct 2009)
New Revision: 17832
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4961
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2009-10-01 12:14:11 UTC (rev 17831)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2009-10-01 12:16:43 UTC (rev 17832)
@@ -625,7 +625,7 @@
<hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPClassHyperlinkPartitioner"
- class="org.jboss.tools.common.text.ext.hyperlink.jsp.JSPClassHyperlinkPartitioner">
+ class="org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPClassHyperlinkPartitioner">
<contentType id="org.eclipse.jst.jsp.core.jspsource">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
14 years, 7 months
JBoss Tools SVN: r17831 - trunk/struts/plugins/org.jboss.tools.struts.text.ext.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-01 08:14:11 -0400 (Thu, 01 Oct 2009)
New Revision: 17831
Modified:
trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4961
Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml 2009-10-01 11:37:00 UTC (rev 17830)
+++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/plugin.xml 2009-10-01 12:14:11 UTC (rev 17831)
@@ -416,7 +416,7 @@
<hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.struts.hyperlink.JSPCSSClassHyperlinkPartitioner"
- class="org.jboss.tools.common.text.ext.hyperlink.jsp.JSPCSSClassHyperlinkPartitioner">
+ class="org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPCSSClassHyperlinkPartitioner">
<contentType id="org.eclipse.jst.jsp.core.jspsource">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/[http://jakarta.apache.org/struts/tags-html]:button/styleClass/" />
@@ -517,7 +517,7 @@
<hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.struts.hyperlink.JSPClassHyperlinkPartitioner"
- class="org.jboss.tools.common.text.ext.hyperlink.jsp.JSPClassHyperlinkPartitioner">
+ class="org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPClassHyperlinkPartitioner">
<contentType id="org.eclipse.jst.jsp.core.jspsource">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/[http://jakarta.apache.org/struts/tags-bean]:define/type/" />
@@ -535,7 +535,7 @@
<hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.struts.hyperlink.JSPLinkHyperlinkPartitioner"
- class="org.jboss.tools.common.text.ext.hyperlink.jsp.JSPLinkHyperlinkPartitioner">
+ class="org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPLinkHyperlinkPartitioner">
<contentType id="org.eclipse.jst.jsp.core.jspsource">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/[http://jakarta.apache.org/struts/tags-html]:frame/href/" />
14 years, 7 months
JBoss Tools SVN: r17830 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-10-01 07:37:00 -0400 (Thu, 01 Oct 2009)
New Revision: 17830
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4526, exception notification and error processing has been added to visual builder
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-10-01 09:51:41 UTC (rev 17829)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-10-01 11:37:00 UTC (rev 17830)
@@ -278,7 +278,7 @@
*/
private boolean addNode(Node sourceNode, nsIDOMNode visualNextNode,
nsIDOMNode visualContainer) {
-
+ try {
nsIDOMNode visualNewNode = createNode(sourceNode, visualContainer);
// Commented as fix for JBIDE-3012.
// // Fix for JBIDE-1097
@@ -299,6 +299,9 @@
}
return true;
}
+ } catch(XPCOMException xpcomException) {
+ VpePlugin.reportProblem(xpcomException);
+ }
return false;
}
14 years, 7 months
JBoss Tools SVN: r17829 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-10-01 05:51:41 -0400 (Thu, 01 Oct 2009)
New Revision: 17829
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4136
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-10-01 09:39:45 UTC (rev 17828)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2009-10-01 09:51:41 UTC (rev 17829)
@@ -82,7 +82,19 @@
droolsLibFolder = new File(seamHomePath, Seam2FacetInstallDelegate.DROOLS_LIB_SEAM_RELATED_PATH);
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamProjectCreator#createEarProject()
+ */
@Override
+ protected void createEarProject() {
+ super.createEarProject();
+ File earContentsFolder = new File(earProjectFolder, "EarContent"); //$NON-NLS-1$
+ File earLibFolder = new File(earContentsFolder, "lib"); //$NON-NLS-1$
+ AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(Seam2FacetInstallDelegate.JBOSS_EAR_LIB).dir(seamLibFolder)));
+ }
+
+ @Override
protected void createTestProject() {
File testProjectDir = new File(seamWebProject.getLocation().removeLastSegments(1).toFile(), testProjectName); //$NON-NLS-1$
testProjectDir.mkdir();
14 years, 7 months
JBoss Tools SVN: r17828 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-10-01 05:39:45 -0400 (Thu, 01 Oct 2009)
New Revision: 17828
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4136
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2009-10-01 08:07:55 UTC (rev 17827)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2009-10-01 09:39:45 UTC (rev 17828)
@@ -36,11 +36,13 @@
public class Seam2FacetInstallDelegate extends SeamFacetAbstractInstallDelegate{
public static final AntCopyUtils.FileSet JBOSS_EAR_CONTENT = new AntCopyUtils.FileSet()
+ .include("jboss-seam.jar"); //$NON-NLS-1$
+
+ public static final AntCopyUtils.FileSet JBOSS_EAR_LIB = new AntCopyUtils.FileSet()
.include("antlr-runtime.jar") //$NON-NLS-1$
.include("commons-beanutils.*\\.jar") //$NON-NLS-1$
.include("drools-compiler.*\\.jar") //$NON-NLS-1$
.include("drools-core.*\\.jar") //$NON-NLS-1$
- .include("jboss-seam.jar") //$NON-NLS-1$
.include("jboss-el.*.jar") //$NON-NLS-1$
.include("mvel.*\\.jar") //$NON-NLS-1$
.include("jbpm-jpdl.*\\.jar") //$NON-NLS-1$
@@ -144,8 +146,8 @@
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false);
AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false);
+ AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_LIB).dir(seamLibFolder)), false);
AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(droolsLibFolder)), false);
- AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false);
AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder)), false);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2009-10-01 08:07:55 UTC (rev 17827)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2009-10-01 09:39:45 UTC (rev 17828)
@@ -509,7 +509,8 @@
}
}
- protected File earContentsFolder;
+ protected File earContentsFolder;
+ protected File earLibFolder;
/**
*
@@ -529,6 +530,7 @@
IVirtualFolder rootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$
earContentsFolder = rootVirtFolder.getUnderlyingFolder().getLocation().toFile();
+ earLibFolder = new File(earContentsFolder, "lib");
File metaInfFolder = new File(earContentsFolder, "META-INF"); //$NON-NLS-1$
File applicationXml = new File(metaInfFolder, "application.xml"); //$NON-NLS-1$
File earProjectFolder = project.getLocation().toFile();
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2009-10-01 08:07:55 UTC (rev 17827)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2009-10-01 09:39:45 UTC (rev 17828)
@@ -147,7 +147,6 @@
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false);
AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false);
AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(droolsLibFolder)), false);
- AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false);
AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder)), false);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-10-01 08:07:55 UTC (rev 17827)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2009-10-01 09:39:45 UTC (rev 17828)
@@ -463,7 +463,6 @@
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamHomeFolder)));
AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamLibFolder)));
AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(droolsLibFolder)));
- AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamLibFolder)));
AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamGenResFolder)));
File resources = new File(earProjectFolder, "resources");
14 years, 7 months
JBoss Tools SVN: r17827 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-10-01 04:07:55 -0400 (Thu, 01 Oct 2009)
New Revision: 17827
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-4914, UI messages was updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-09-30 19:05:29 UTC (rev 17826)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-10-01 08:07:55 UTC (rev 17827)
@@ -98,8 +98,8 @@
VPE_PREFERENCES_PAGE_DESCRIPTION=Visual Page Editor settings
SHOW_BORDER_FOR_UNKNOWN_TAGS=Show border for unknown tags
SHOW_SELECTION_TAG_BAR=Show selection tag bar
-SHOW_TEXT_FORMATTING = Show Text Formatting bar
-HIDE_TEXT_FORMATTING = Hide Text Formatting bar
+SHOW_TEXT_FORMATTING = Show text formatting bar
+HIDE_TEXT_FORMATTING = Hide text formatting bar
SHOW_RESOURCE_BUNDLES_USAGE_AS_EL=Show resource bundles usage as EL expressions
SHOW_BUNDLES_AS_EL=Show bundle's messages as EL
SHOW_BUNDLES_AS_MESSAGES=Show bundle's messages explicitly
14 years, 7 months