JBoss Tools SVN: r22304 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-25 09:31:22 -0400 (Tue, 25 May 2010)
New Revision: 22304
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
Log:
https://jira.jboss.org/browse/JBIDE-6339
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2010-05-25 11:23:14 UTC (rev 22303)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2010-05-25 13:31:22 UTC (rev 22304)
@@ -49,7 +49,7 @@
}
protected Parameter newParameter() {
- return ((MethodDefinition)definition).isConstructor() ? new InjectionPointParameter() : new Parameter();
+ return ((MethodDefinition)definition).parametersAreInjectionPoints() ? new InjectionPointParameter() : new Parameter();
}
public IMethod getMethod() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-05-25 11:23:14 UTC (rev 22303)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-05-25 13:31:22 UTC (rev 22304)
@@ -31,6 +31,7 @@
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
import org.jboss.tools.cdi.core.IParametedType;
+import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
import org.jboss.tools.cdi.core.IScope;
@@ -244,6 +245,13 @@
if(m instanceof IInjectionPoint) {
result.add((IInjectionPoint)m);
}
+ List<IParameter> ps = m.getParameters();
+ for (IParameter p: ps) {
+ if(p instanceof IInjectionPoint) {
+ result.add((IInjectionPoint)p);
+ }
+ }
+
}
return result;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-25 11:23:14 UTC (rev 22303)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-25 13:31:22 UTC (rev 22304)
@@ -58,8 +58,8 @@
}
- boolean parametersAreInjectionPoints() {
- return isConstructor || getProducesAnnotation() != null || getInjectAnnotation() != null;
+ public boolean parametersAreInjectionPoints() {
+ return getProducesAnnotation() != null || getInjectAnnotation() != null;
}
void loadParamDefinitions(IType contextType, DefinitionContext context) throws CoreException {
@@ -80,13 +80,17 @@
int paramEnd = content.lastIndexOf(')', declEnd);
if(paramEnd < 0) return;
String paramsString = content.substring(paramStart + 1, paramEnd);
- if(paramsString.indexOf('@') < 0) return;
- String[] params = paramsString.split(",");
+ if(!parametersAreInjectionPoints && paramsString.indexOf('@') < 0) return;
+ String[] params = getParams(paramsString);
String[] ps = method.getParameterTypes();
int start = paramStart + 1;
for (int i = 0; i < params.length; i++) {
- if(params[i].indexOf('@') < 0 && !parametersAreInjectionPoints) {
+ if(ps.length <= i) {
+ System.out.println("Panic");
+ continue;
+ }
+ if(!parametersAreInjectionPoints && params[i].indexOf('@') < 0) {
start += params[i].length() + 1;
continue; //do not need parameters without annotation
}
@@ -109,9 +113,8 @@
v.valueLength = p.length();
pd.setPosition(v);
- StringTokenizer tokens = new StringTokenizer(p, " \r\n\t");
- while (tokens.hasMoreElements()) {
- String q = tokens.nextToken();
+ String[] tokens = getParamTokens(p);
+ for (String q: tokens) {
if(!q.startsWith("@")) continue;
v = new ValueInfo();
v.setValue(q);
@@ -151,6 +154,81 @@
}
return false;
}
-
+ static String[] getParams(String paramsString) {
+ List<String> result = new ArrayList<String>();
+ int i = 0;
+ int c1 = 0;
+ int c2 = 0;
+ char quote = '\0';
+ StringBuffer sb = new StringBuffer();
+ while(i < paramsString.length()) {
+ char c = paramsString.charAt(i);
+ if(c == ',' && c1 == 0 && c2 == 0 && quote == '\0') {
+ result.add(sb.toString());
+ sb.setLength(0);
+ i++;
+ continue;
+ } else if(c == '(' && quote == '\0') {
+ c1++;
+ } else if(c == ')' && quote == '\0') {
+ c1--;
+ } else if(c == '<' && quote == '\0') {
+ c2++;
+ } else if(c == '>' && quote == '\0') {
+ c2--;
+ } else if((c == '\'' || c == '"') && quote == '\0') {
+ quote = c;
+ } else if(quote == c) {
+ quote = '\0';
+ }
+ sb.append(c);
+ i++;
+ }
+ if(sb.length() > 0) {
+ result.add(sb.toString());
+ }
+ return result.toArray(new String[0]);
+ }
+
+ static String[] getParamTokens(String paramsString) {
+ List<String> result = new ArrayList<String>();
+ int i = 0;
+ int c1 = 0;
+ int c2 = 0;
+ char quote = '\0';
+ StringBuffer sb = new StringBuffer();
+ while(i < paramsString.length()) {
+ char c = paramsString.charAt(i);
+ boolean ws = Character.isWhitespace(c);
+ if(ws && c1 == 0 && c2 == 0 && quote == '\0') {
+ String t = sb.toString().trim();
+ if(t.length() > 0) {
+ result.add(t);
+ }
+ sb.setLength(0);
+ i++;
+ continue;
+ } else if(c == '(' && quote == '\0') {
+ c1++;
+ } else if(c == ')' && quote == '\0') {
+ c1--;
+ } else if(c == '<' && quote == '\0') {
+ c2++;
+ } else if(c == '>' && quote == '\0') {
+ c2--;
+ } else if((c == '\'' || c == '"') && quote == '\0') {
+ quote = c;
+ } else if(quote == c) {
+ quote = '\0';
+ }
+ sb.append(c);
+ i++;
+ }
+ if(sb.length() > 0) {
+ result.add(sb.toString());
+ }
+ return result.toArray(new String[0]);
+ }
+
}
15 years, 11 months
JBoss Tools SVN: r22303 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-25 07:23:14 -0400 (Tue, 25 May 2010)
New Revision: 22303
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
Log:
https://jira.jboss.org/browse/JBIDE-6339
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2010-05-25 11:18:21 UTC (rev 22302)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2010-05-25 11:23:14 UTC (rev 22303)
@@ -49,7 +49,7 @@
}
protected Parameter newParameter() {
- return new Parameter();
+ return ((MethodDefinition)definition).isConstructor() ? new InjectionPointParameter() : new Parameter();
}
public IMethod getMethod() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-25 11:18:21 UTC (rev 22302)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-25 11:23:14 UTC (rev 22303)
@@ -58,9 +58,13 @@
}
+ boolean parametersAreInjectionPoints() {
+ return isConstructor || getProducesAnnotation() != null || getInjectAnnotation() != null;
+ }
+
void loadParamDefinitions(IType contextType, DefinitionContext context) throws CoreException {
if(method == null) return;
- boolean isProducer = getProducesAnnotation() != null;
+ boolean parametersAreInjectionPoints = parametersAreInjectionPoints();
String[] parameterNames = method.getParameterNames();
if(parameterNames == null || parameterNames.length == 0) return;
if(contextType == null || contextType.isBinary()) return;
@@ -82,7 +86,7 @@
int start = paramStart + 1;
for (int i = 0; i < params.length; i++) {
- if(params[i].indexOf('@') < 0 && !isProducer) {
+ if(params[i].indexOf('@') < 0 && !parametersAreInjectionPoints) {
start += params[i].length() + 1;
continue; //do not need parameters without annotation
}
15 years, 11 months
JBoss Tools SVN: r22302 - in branches/3.2.helios/jmx: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-05-25 07:18:21 -0400 (Tue, 25 May 2010)
New Revision: 22302
Modified:
branches/3.2.helios/jmx/
branches/3.2.helios/jmx/features/
branches/3.2.helios/jmx/plugins/
Log:
svn ignore target folders
Property changes on: branches/3.2.helios/jmx
___________________________________________________________________
Name: svn:ignore
- test
+ test
target
Property changes on: branches/3.2.helios/jmx/features
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: branches/3.2.helios/jmx/plugins
___________________________________________________________________
Name: svn:ignore
+ target
15 years, 11 months
JBoss Tools SVN: r22301 - in branches/3.2.helios: jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-05-25 06:20:51 -0400 (Tue, 25 May 2010)
New Revision: 22301
Modified:
branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.feature/.project
branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature/.project
branches/3.2.helios/modeshape/features/org.jboss.tools.modeshape.rest.test.sdk.feature/.project
Log:
JBIDE-6342 broken .project files
Modified: branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.feature/.project
===================================================================
--- branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.feature/.project 2010-05-25 08:59:54 UTC (rev 22300)
+++ branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.feature/.project 2010-05-25 10:20:51 UTC (rev 22301)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.jbpm3.tests.feature</name>
+ <name>org.jboss.tools.jbpm3.tests.sdk.feature</name>
<comment></comment>
<projects>
</projects>
Modified: branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature/.project
===================================================================
--- branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature/.project 2010-05-25 08:59:54 UTC (rev 22300)
+++ branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature/.project 2010-05-25 10:20:51 UTC (rev 22301)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.jbpm4.tests.feature</name>
+ <name>org.jboss.tools.jbpm4.tests.sdk.feature</name>
<comment></comment>
<projects>
</projects>
Modified: branches/3.2.helios/modeshape/features/org.jboss.tools.modeshape.rest.test.sdk.feature/.project
===================================================================
--- branches/3.2.helios/modeshape/features/org.jboss.tools.modeshape.rest.test.sdk.feature/.project 2010-05-25 08:59:54 UTC (rev 22300)
+++ branches/3.2.helios/modeshape/features/org.jboss.tools.modeshape.rest.test.sdk.feature/.project 2010-05-25 10:20:51 UTC (rev 22301)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.modeshape.rest.test.feature</name>
+ <name>org.jboss.tools.modeshape.rest.test.sdk.feature</name>
<comment></comment>
<projects>
</projects>
15 years, 11 months
JBoss Tools SVN: r22300 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: messages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-05-25 04:59:54 -0400 (Tue, 25 May 2010)
New Revision: 22300
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-2795 , Dialogs' titles were changed, "File name:" label were added.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-05-25 05:48:18 UTC (rev 22299)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ExportUnknownTagsTemplatesWizardPage.java 2010-05-25 08:59:54 UTC (rev 22300)
@@ -30,6 +30,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
@@ -78,7 +79,7 @@
* Two columns.
*/
Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
+ composite.setLayout(new GridLayout(3, false));
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
composite.setFont(parent.getFont());
@@ -88,7 +89,7 @@
tagsTable = new Table(composite, SWT.BORDER);
TableLayout layout = new TableLayout();
tagsTable.setLayout(layout);
- tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+ tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
tagsTable.setHeaderVisible(true);
tagsTable.setLinesVisible(true);
@@ -108,20 +109,28 @@
VpeImportExportWizardsUtils.updateTagsTable(tagsTable, tagsList, true);
/*
- * Add path output and browse button
+ * Add label
*/
+ Label fileNamaLabel = new Label(composite, SWT.NONE);
+ fileNamaLabel.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, false, false, 1, 1));
+ fileNamaLabel.setText(VpeUIMessages.FILE_NAME_LABEL);
+ /*
+ * Add output path
+ */
final Text pathText = new Text(composite, SWT.BORDER);
- pathText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
+ pathText.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false, 1, 1));
pathText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
pathString = ((Text)e.getSource()).getText();
setPageComplete(isPageComplete());
}
});
-
+ /*
+ * Add browse button
+ */
Button browseButton = new Button(composite, SWT.NONE);
browseButton.setText(VpeUIMessages.BROWSE_BUTTON_TEXT);
- browseButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false, 1, 1));
+ browseButton.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, false, 1, 1));
browseButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
FileDialog dialog = new FileDialog(PlatformUI.getWorkbench()
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-05-25 05:48:18 UTC (rev 22299)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wizards/ImportUnknownTagsTemplatesWizardPage.java 2010-05-25 08:59:54 UTC (rev 22300)
@@ -31,6 +31,7 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
@@ -76,16 +77,22 @@
* Two columns.
*/
Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
+ composite.setLayout(new GridLayout(3, false));
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
composite.setFont(parent.getFont());
/*
- * Add path output and browse button
+ * Add label
*/
+ Label fileNamaLabel = new Label(composite, SWT.NONE);
+ fileNamaLabel.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, false, false, 1, 1));
+ fileNamaLabel.setText(VpeUIMessages.FILE_NAME_LABEL);
+ /*
+ * Add output path
+ */
final Text pathText = new Text(composite, SWT.BORDER);
pathText.setEditable(true);
- pathText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
+ pathText.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false, 1, 1));
pathText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
pathString = ((Text)e.getSource()).getText();
@@ -119,10 +126,12 @@
setPageComplete(isPageComplete());
}
});
-
+ /*
+ * Add browse button
+ */
Button browseButton = new Button(composite, SWT.NONE);
browseButton.setText(VpeUIMessages.BROWSE_BUTTON_TEXT);
- browseButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false, 1, 1));
+ browseButton.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, false, 1, 1));
browseButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
FileDialog dialog = new FileDialog(PlatformUI.getWorkbench()
@@ -145,7 +154,7 @@
tagsTable = new Table(composite, SWT.BORDER);
TableLayout layout = new TableLayout();
tagsTable.setLayout(layout);
- tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 2));
+ tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
tagsTable.setHeaderVisible(true);
tagsTable.setLinesVisible(true);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-05-25 05:48:18 UTC (rev 22299)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-05-25 08:59:54 UTC (rev 22300)
@@ -152,6 +152,7 @@
public static String SELECT_ALL;
public static String DESELECT_ALL;
public static String BROWSE_BUTTON_TEXT;
+ public static String FILE_NAME_LABEL;
public static String NONE_TEMPLATES_WERE_ADDED;
public static String COULD_NOT_SET_TABLE_SELECTION;
public static String CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT;
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 2010-05-25 05:48:18 UTC (rev 22299)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-05-25 08:59:54 UTC (rev 22300)
@@ -135,10 +135,11 @@
SELECT_ALL=Select All
DESELECT_ALL=Deselect All
BROWSE_BUTTON_TEXT=Browse...
-EXPORT_UNKNOWN_TAGS_PAGE_TITLE=Unknown tags templates
-EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Export unknown tags templates to external file
-IMPORT_UNKNOWN_TAGS_PAGE_TITLE=Unknown tags templates
-IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Import unknown tags templates from external file
+FILE_NAME_LABEL=File name:
+EXPORT_UNKNOWN_TAGS_PAGE_TITLE=Export Unknown Tags Templates
+EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Export unknown tags templates to the external file
+IMPORT_UNKNOWN_TAGS_PAGE_TITLE=Import Unknown Tags Templates
+IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=Import unknown tags templates from the external file
NONE_TEMPLATES_WERE_ADDED=None of the templates were added.
COULD_NOT_SET_TABLE_SELECTION=Could not set table selection.
LIST_IS_EMPTY=List is empty
15 years, 11 months
JBoss Tools SVN: r22299 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-05-25 01:48:18 -0400 (Tue, 25 May 2010)
New Revision: 22299
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
revert to previous revision
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-05-24 21:22:51 UTC (rev 22298)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-05-25 05:48:18 UTC (rev 22299)
@@ -195,7 +195,7 @@
* @param path the path
* @param projectName the project name
*/
- static public IProject importProjectIntoWorkspace(String path, String projectName) throws IOException {
+ static public IProject importProjectIntoWorkspace(String path, String projectName) {
IProject project = null;
@@ -219,16 +219,10 @@
unimportedFiles.add(".svn"); //$NON-NLS-1$
importProvider.setUnimportedFiles(unimportedFiles);
-
- File file = new File(path);
-
- if(!file.isDirectory()) {
- throw new IOException("Cannot import test project from " + file);
- }
// create import operation
ImportOperation importOp = new ImportOperation(project
- .getFullPath(), file, importProvider, overwrite);
+ .getFullPath(), new File(path), importProvider, overwrite);
// import files just to project folder ( without old structure )
importOp.setCreateContainerStructure(false);
15 years, 11 months
JBoss Tools SVN: r22298 - branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-24 17:22:51 -0400 (Mon, 24 May 2010)
New Revision: 22298
Modified:
branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
Log:
https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds richfaces fragments to web.xml
Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
===================================================================
--- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-05-24 21:18:11 UTC (rev 22297)
+++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-05-24 21:22:51 UTC (rev 22298)
@@ -349,8 +349,8 @@
if (isSeamFacet) {
return true;
}
- if (!libraryConfig.isAddRichfacesCapabilities()) {
- return false;
+ if (libraryConfig.isAddRichfacesCapabilities()) {
+ return true;
}
}
15 years, 11 months
JBoss Tools SVN: r22297 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-24 17:18:11 -0400 (Mon, 24 May 2010)
New Revision: 22297
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
Log:
https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds richfaces fragments to web.xml
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-05-24 21:14:40 UTC (rev 22296)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-05-24 21:18:11 UTC (rev 22297)
@@ -349,8 +349,8 @@
if (isSeamFacet) {
return true;
}
- if (!libraryConfig.isAddRichfacesCapabilities()) {
- return false;
+ if (libraryConfig.isAddRichfacesCapabilities()) {
+ return true;
}
}
15 years, 11 months
JBoss Tools SVN: r22296 - branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-05-24 17:14:40 -0400 (Mon, 24 May 2010)
New Revision: 22296
Modified:
branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
Log:
https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds richfaces fragments to web.xml
Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
===================================================================
--- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-05-24 19:24:14 UTC (rev 22295)
+++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2010-05-24 21:14:40 UTC (rev 22296)
@@ -349,8 +349,8 @@
if (isSeamFacet) {
return true;
}
- if (!libraryConfig.isAddRichfacesCapabilities()) {
- return false;
+ if (libraryConfig.isAddRichfacesCapabilities()) {
+ return true;
}
}
15 years, 11 months