JBoss Tools SVN: r43617 - branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-12 04:36:15 -0400 (Wed, 12 Sep 2012)
New Revision: 43617
Modified:
branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java
branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
Log:
JBIDE-11927 to maintenance
Modified: branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java
===================================================================
--- branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java 2012-09-12 08:35:11 UTC (rev 43616)
+++ branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java 2012-09-12 08:36:15 UTC (rev 43617)
@@ -205,14 +205,15 @@
if( o instanceof WrappedProject && shouldRefreshProject())
o = ((WrappedProject)o).element;
- if( viewerInUse instanceof StructuredViewer ) {
- ((StructuredViewer)viewerInUse).refresh(o);
- if( viewerInUse instanceof TreeViewer ) {
- ((TreeViewer)viewerInUse).expandToLevel(o, 1);
- }
- } else
- viewerInUse.refresh();
-
+ if( !viewerInUse.getControl().isDisposed()) {
+ if( viewerInUse instanceof StructuredViewer ) {
+ ((StructuredViewer)viewerInUse).refresh(o);
+ if( viewerInUse instanceof TreeViewer ) {
+ ((TreeViewer)viewerInUse).expandToLevel(o, 1);
+ }
+ } else
+ viewerInUse.refresh();
+ }
}
protected IArchiveNode[] getChanges(IArchiveNodeDelta delta) {
IArchiveNodeDelta[] children = delta.getAllAffectedChildren();
Modified: branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
===================================================================
--- branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2012-09-12 08:35:11 UTC (rev 43616)
+++ branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2012-09-12 08:36:15 UTC (rev 43617)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.archives.ui.providers;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
@@ -36,11 +37,15 @@
public Object[] getChildren(Object parentElement) {
if( parentElement instanceof IProject) {
- if( ((IProject)parentElement).isOpen())
- if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE) ||
- ArchivesModel.instance().canReregister(((IProject)parentElement).getLocation())) {
+ if( ((IProject)parentElement).isOpen()) {
+ IPath loc = ((IProject)parentElement).getLocation();
+ boolean alwaysShow = PrefsInitializer.getBoolean(PrefsInitializer.PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE);
+ boolean fileExists = ArchivesModel.instance().canReregister(loc);
+ boolean nodeExists = ArchivesModel.instance().getRoot(loc) != null;
+ if( alwaysShow || fileExists || nodeExists ) {
return new Object[] { new WrappedProject((IProject)parentElement, WrappedProject.CATEGORY) };
}
+ }
return new Object[]{};
}
return delegate.getChildren(parentElement);
13 years, 4 months
JBoss Tools SVN: r43616 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-12 04:35:11 -0400 (Wed, 12 Sep 2012)
New Revision: 43616
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
Log:
JBIDE-11927 to trunk
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java 2012-09-12 03:01:27 UTC (rev 43615)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesContentProviderDelegate.java 2012-09-12 08:35:11 UTC (rev 43616)
@@ -205,14 +205,15 @@
if( o instanceof WrappedProject && shouldRefreshProject())
o = ((WrappedProject)o).element;
- if( viewerInUse instanceof StructuredViewer ) {
- ((StructuredViewer)viewerInUse).refresh(o);
- if( viewerInUse instanceof TreeViewer ) {
- ((TreeViewer)viewerInUse).expandToLevel(o, 1);
- }
- } else
- viewerInUse.refresh();
-
+ if( !viewerInUse.getControl().isDisposed()) {
+ if( viewerInUse instanceof StructuredViewer ) {
+ ((StructuredViewer)viewerInUse).refresh(o);
+ if( viewerInUse instanceof TreeViewer ) {
+ ((TreeViewer)viewerInUse).expandToLevel(o, 1);
+ }
+ } else
+ viewerInUse.refresh();
+ }
}
protected IArchiveNode[] getChanges(IArchiveNodeDelta delta) {
IArchiveNodeDelta[] children = delta.getAllAffectedChildren();
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2012-09-12 03:01:27 UTC (rev 43615)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2012-09-12 08:35:11 UTC (rev 43616)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.archives.ui.providers;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
@@ -36,11 +37,15 @@
public Object[] getChildren(Object parentElement) {
if( parentElement instanceof IProject) {
- if( ((IProject)parentElement).isOpen())
- if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE) ||
- ArchivesModel.instance().canReregister(((IProject)parentElement).getLocation())) {
+ if( ((IProject)parentElement).isOpen()) {
+ IPath loc = ((IProject)parentElement).getLocation();
+ boolean alwaysShow = PrefsInitializer.getBoolean(PrefsInitializer.PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE);
+ boolean fileExists = ArchivesModel.instance().canReregister(loc);
+ boolean nodeExists = ArchivesModel.instance().getRoot(loc) != null;
+ if( alwaysShow || fileExists || nodeExists ) {
return new Object[] { new WrappedProject((IProject)parentElement, WrappedProject.CATEGORY) };
}
+ }
return new Object[]{};
}
return delegate.getChildren(parentElement);
13 years, 4 months
JBoss Tools SVN: r43615 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-11 23:01:27 -0400 (Tue, 11 Sep 2012)
New Revision: 43615
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
Log:
Restored all tests - again
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-12 01:20:07 UTC (rev 43614)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-12 03:01:27 UTC (rev 43615)
@@ -31,18 +31,18 @@
CreateRuntimeFromSOA.class,
NewProjectUsingRuntime.class,
NewProjectUsingBundledInEAP.class,
-// Editing.class,
- HelloWorld.class
-// HelloWorldAction.class,
-// HelloWorldFileAction.class,
-// SmooksCSV2XML.class,
-// SmooksXML2POJO.class,
-// SmooksXML2XMLDateManipulation.class,
-// SmooksXML2XMLSimple.class,
-// WebServiceConsumer1.class,
-// WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
-// WebServiceProducerHttp.class,
-// WebServiceProducerSocket.class
+ Editing.class,
+ HelloWorld.class,
+ HelloWorldAction.class,
+ HelloWorldFileAction.class,
+ SmooksCSV2XML.class,
+ SmooksXML2POJO.class,
+ SmooksXML2XMLDateManipulation.class,
+ SmooksXML2XMLSimple.class,
+ WebServiceConsumer1.class,
+ WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
+ WebServiceProducerHttp.class,
+ WebServiceProducerSocket.class
//SimpleEAPTest.class
})
@RunWith(RequirementAwareSuite.class)
13 years, 4 months
JBoss Tools SVN: r43613 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-11 20:47:39 -0400 (Tue, 11 Sep 2012)
New Revision: 43613
Modified:
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
update p2mirror scripts to reflect mistria's latest update (for m2e) (JBIDE-12579)
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2012-09-12 00:38:19 UTC (rev 43612)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2012-09-12 00:47:39 UTC (rev 43613)
@@ -57,7 +57,7 @@
<iu id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
<iu id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
-<iu id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120906-1800"/>
+<iu id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120910-0913"/>
<iu id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/>
<iu id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<iu id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2012-09-12 00:38:19 UTC (rev 43612)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2012-09-12 00:47:39 UTC (rev 43613)
@@ -57,7 +57,7 @@
<iu id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
<iu id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
-<iu id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120906-1800"/>
+<iu id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120910-0913"/>
<iu id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/>
<iu id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<iu id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2012-09-12 00:38:19 UTC (rev 43612)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2012-09-12 00:47:39 UTC (rev 43613)
@@ -57,7 +57,7 @@
<iu id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
<iu id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
-<iu id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120906-1800"/>
+<iu id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120910-0913"/>
<iu id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/>
<iu id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<iu id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
13 years, 4 months
JBoss Tools SVN: r43612 - trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-09-11 20:38:19 -0400 (Tue, 11 Sep 2012)
New Revision: 43612
Modified:
trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java
Log:
fixed compilation errors in seam.detector.test after refactoring
Modified: trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java 2012-09-12 00:25:40 UTC (rev 43611)
+++ trunk/seam/tests/org.jboss.tools.runtime.seam.detector.test/src/org/jboss/tools/runtime/seam/detector/test/SeamRuntimeDetectionTest.java 2012-09-12 00:38:19 UTC (rev 43612)
@@ -285,13 +285,13 @@
List<RuntimeDefinition> serverDefinitions = locator
.searchForRuntimes(runtimePath.getPath(),
new NullProgressMonitor());
-
- // Shouldn't this be done by the framework somehow??
- runtimePath.getRuntimeDefinitions().clear();
- for (RuntimeDefinition serverDefinition : serverDefinitions) {
- serverDefinition.setRuntimePath(runtimePath);
- }
- runtimePath.getRuntimeDefinitions().addAll(serverDefinitions);
+//
+// // Shouldn't this be done by the framework somehow??
+// runtimePath.getRuntimeDefinitions().clear();
+// for (RuntimeDefinition serverDefinition : serverDefinitions) {
+// serverDefinition.setRuntimePath(runtimePath);
+// }
+// runtimePath.getRuntimeDefinitions().addAll(serverDefinitions);
return serverDefinitions;
}
@@ -301,11 +301,11 @@
return runtimePath;
}
private void setRuntimePaths(RuntimePath runtimePath, boolean save) {
- Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault().getRuntimePaths();
- runtimePaths.clear();
- runtimePaths.add(runtimePath);
+ //Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault().getRuntimePaths();
+ //runtimePaths.clear();
+ //runtimePaths.add(runtimePath);
if( save )
- RuntimeUIActivator.getDefault().saveRuntimePaths();
+ RuntimeUIActivator.getDefault().saveRuntimePreferences();
}
13 years, 4 months
JBoss Tools SVN: r43611 - in trunk: common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-09-11 20:25:40 -0400 (Tue, 11 Sep 2012)
New Revision: 43611
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java
trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/StringUtil.java
trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/util/test/StringUtilTest.java
Log:
JBIDE-12589 o.j.t.jsf.ui.test.* JUnit tests fail
StringUtil is fixed and new JUnit tests were added
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2012-09-12 00:15:16 UTC (rev 43610)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2012-09-12 00:25:40 UTC (rev 43611)
@@ -517,7 +517,7 @@
*/
private boolean isRelevant(ELInvocationExpression expr, Variable variable) {
LexicalToken t = expr.getFirstToken();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(t.getText());
boolean ok = sb.toString().equals(variable.name);
while(!ok && t != null && t != expr.getLastToken()) {
@@ -540,23 +540,24 @@
return;
String propertyName = segment.getToken().getText();
-
+
IProperty prop = bundle.getProperty(StringUtil.trimQuotes(propertyName));
- if(prop == null) continue;
- Map<String, LocalizedValue> values = ((PropertyImpl)prop).getValues();
- for (LocalizedValue value: values.values()) {
- XModelObject p = value.getObject();
- segment.addObject(p);
- segment.setBaseName(variable.basename);
-
- PositionHolder h = PositionHolder.getPosition(p, null);
- h.update();
- segment.setMessagePropertySourceReference(h.getStart(), prop.getName().length());
-
- IFile propFile = (IFile)p.getAdapter(IFile.class);
- if(propFile == null)
- continue;
- segment.setMessageBundleResource(propFile);
+ if(prop != null) {
+ Map<String, LocalizedValue> values = ((PropertyImpl)prop).getValues();
+ for (LocalizedValue value: values.values()) {
+ XModelObject p = value.getObject();
+ segment.addObject(p);
+ segment.setBaseName(variable.basename);
+
+ PositionHolder h = PositionHolder.getPosition(p, null);
+ h.update();
+ segment.setMessagePropertySourceReference(h.getStart(), prop.getName().length());
+
+ IFile propFile = (IFile)p.getAdapter(IFile.class);
+ if(propFile == null)
+ continue;
+ segment.setMessageBundleResource(propFile);
+ }
}
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/StringUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/StringUtil.java 2012-09-12 00:15:16 UTC (rev 43610)
+++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/StringUtil.java 2012-09-12 00:25:40 UTC (rev 43611)
@@ -29,17 +29,19 @@
* @return Non-quoted text value
*/
public static String trimQuotes(String result) {
- if (result == null || result.length() == 0)
- return result;
- int start = 0, end = result.length();
- char first = result.charAt(start);
- char last = result.charAt(end - 1);
- if (first == APO || first == QUOT) {
- start++;
+ String temp = result;
+ if(!temp.isEmpty()) {
+ int start = 0, end = result.length();
+ char first = result.charAt(start);
+ char last = result.charAt(end - 1);
+ if (first == APO || first == QUOT) {
+ start++;
+ }
+ if ((last == APO || last == QUOT) && end>1) {
+ end--;
+ }
+ temp = result.substring(start, end);
}
- if (last == APO || last == QUOT) {
- end--;
- }
- return result.substring(start, end);
+ return temp;
}
}
Modified: trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/util/test/StringUtilTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/util/test/StringUtilTest.java 2012-09-12 00:15:16 UTC (rev 43610)
+++ trunk/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/util/test/StringUtilTest.java 2012-09-12 00:25:40 UTC (rev 43611)
@@ -8,10 +8,11 @@
public class StringUtilTest extends TestCase{
+ final String[] OPTIONS = new String[] {"","'","\""};
+
@Test
public void testTrimQuotes() {
- String text = "text";
- final String[] OPTIONS = new String[] {"","'","\""};
+ String text = "t";
for(int i = 0;i<OPTIONS.length;i++) {
for(int j = 0;j<OPTIONS.length;j++) {
String target = OPTIONS[i] + text + OPTIONS[j];
@@ -21,4 +22,10 @@
}
}
+ public void testTrimForStringLength0to1() {
+ for (String charq: OPTIONS) {
+ assertTrue("".equals(StringUtil.trimQuotes(charq)));
+ }
+ }
+
}
13 years, 4 months
JBoss Tools SVN: r43610 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-09-11 20:15:16 -0400 (Tue, 11 Sep 2012)
New Revision: 43610
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
Log:
Still debugging ESB Bot tests on Windows - only test clients that depend on JMS are failing now - commented out all but helloworld test to debug
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-11 23:25:53 UTC (rev 43609)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/ESBAllBotTests.java 2012-09-12 00:15:16 UTC (rev 43610)
@@ -31,18 +31,18 @@
CreateRuntimeFromSOA.class,
NewProjectUsingRuntime.class,
NewProjectUsingBundledInEAP.class,
- Editing.class,
- HelloWorld.class,
- HelloWorldAction.class,
- HelloWorldFileAction.class,
- SmooksCSV2XML.class,
- SmooksXML2POJO.class,
- SmooksXML2XMLDateManipulation.class,
- SmooksXML2XMLSimple.class,
- WebServiceConsumer1.class,
- WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
- WebServiceProducerHttp.class,
- WebServiceProducerSocket.class
+// Editing.class,
+ HelloWorld.class
+// HelloWorldAction.class,
+// HelloWorldFileAction.class,
+// SmooksCSV2XML.class,
+// SmooksXML2POJO.class,
+// SmooksXML2XMLDateManipulation.class,
+// SmooksXML2XMLSimple.class,
+// WebServiceConsumer1.class,
+// WebServiceProducer.class, // http://lists.jboss.org/pipermail/jbosstools-dev/2008-December/002559.html
+// WebServiceProducerHttp.class,
+// WebServiceProducerSocket.class
//SimpleEAPTest.class
})
@RunWith(RequirementAwareSuite.class)
13 years, 4 months
JBoss Tools SVN: r43609 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-11 19:25:53 -0400 (Tue, 11 Sep 2012)
New Revision: 43609
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
JBIDE-12446
https://issues.jboss.org/browse/JBIDE-12446
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 2012-09-11 23:11:58 UTC (rev 43608)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2012-09-11 23:25:53 UTC (rev 43609)
@@ -374,7 +374,7 @@
Collection<IBean> beans = null;
//DB
- if(dbCache != null) {
+ if(dbCache != null && type.getType() != null) {
beans = dbCache.getBeansByLegalType(this, type.getType().getFullyQualifiedName());
}
//Compare with result from cache.
13 years, 4 months
JBoss Tools SVN: r43608 - trunk/cdi/plugins/org.jboss.tools.cdi.gen/src/org/jboss/tools/cdi/gen.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-09-11 19:11:58 -0400 (Tue, 11 Sep 2012)
New Revision: 43608
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.gen/src/org/jboss/tools/cdi/gen/CDIProjectGenerator.java
Log:
JBIDE-12446
https://issues.jboss.org/browse/JBIDE-12446
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.gen/src/org/jboss/tools/cdi/gen/CDIProjectGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.gen/src/org/jboss/tools/cdi/gen/CDIProjectGenerator.java 2012-09-11 19:32:53 UTC (rev 43607)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.gen/src/org/jboss/tools/cdi/gen/CDIProjectGenerator.java 2012-09-11 23:11:58 UTC (rev 43608)
@@ -56,6 +56,7 @@
int fieldInjectionsPerClassCount = 20;
int initMethodsPerClass = 3;
int paramsPerInitMethod = 2;
+ int elInstancesPerClass = 20;
public CDIProjectGenerator() {}
@@ -223,6 +224,12 @@
nameProperty.setReturnType(string);
nameProperty.setName("getName");
classes[i].addMethod(nameProperty);
+
+ // getSelf();
+ GenMethod selfProperty = new GenMethod();
+ selfProperty.setReturnType(classes[i]);
+ selfProperty.setName("getSelf");
+ classes[i].addMethod(selfProperty);
//initializers
for (int j = 0; j < initMethodsPerClass; j++) {
@@ -248,12 +255,14 @@
//EL
for (int i = 0; i < classes.length; i++) {
- GenField f = new GenField();
- f.setName("el");
- f.setType(string);
- String beanName = beanNames.get(seed.nextInt(beanNames.size()));
- f.setInitValue("\"#{" + beanName + ".name}\"");
- classes[i].addField(f);
+ for (int k = 0; k < elInstancesPerClass; k++) {
+ GenField f = new GenField();
+ f.setName("el" + k);
+ f.setType(string);
+ String beanName = beanNames.get(seed.nextInt(beanNames.size()));
+ f.setInitValue("\"#{" + beanName + ".self.self.name}\"");
+ classes[i].addField(f);
+ }
}
}
13 years, 4 months
JBoss Tools SVN: r43607 - workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-11 15:32:53 -0400 (Tue, 11 Sep 2012)
New Revision: 43607
Modified:
workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java
Log:
https://issues.jboss.org/browse/JBIDE-12446
Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java 2012-09-11 18:59:35 UTC (rev 43606)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/org/jboss/tools/cdi/db/CDIDataBase.java 2012-09-11 19:32:53 UTC (rev 43607)
@@ -18,6 +18,7 @@
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
+import javax.persistence.FlushModeType;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.IBean;
@@ -119,8 +120,9 @@
em.createQuery("DELETE FROM QualifierEntity q WHERE q.projectIndex = :p").setParameter("p", projectIndex).executeUpdate();
em.createQuery("DELETE FROM BeanEntity b WHERE b.projectIndex = :p").setParameter("p", projectIndex).executeUpdate();
}
+// em.setFlushMode(FlushModeType.COMMIT);
+ em.clear();
projectIndex = context.generateProjectIndex(project);
-
Map<Integer, QualifierEntity> qualifiers = new HashMap<Integer, QualifierEntity>();
for (IBean bean : beans) {
context.getAllBeans().put(bean.getId(), bean);
@@ -181,7 +183,11 @@
try {
long typeIndex = currentContext.getTypeIndex(legalType);
- List results = em.createQuery("SELECT t.bean FROM TypeEntity t WHERE t.index = :b AND t.bean.projectIndex = :p").setParameter("p", projectIndex).setParameter("b", typeIndex).getResultList();
+ List results = em.createQuery("SELECT t.bean FROM TypeEntity t WHERE t.index = :b AND t.bean.projectIndex = :p")
+ .setParameter("p", projectIndex)
+ .setParameter("b", typeIndex)
+ .setHint("org.hibernate.readOnly", true)
+ .getResultList();
for (Object result : results) {
BeanEntity beanEntity = (BeanEntity)result;
int index = beanEntity.getIndex();
@@ -189,6 +195,7 @@
if(bean != null) {
beans.add(bean);
} else {
+ System.out.println("Not found bean " + index);
//report a problem
}
}
13 years, 4 months