JBoss Tools SVN: r34506 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-02 19:44:39 -0400 (Fri, 02 Sep 2011)
New Revision: 34506
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java
Log:
JBIDE-9645
https://issues.jboss.org/browse/JBIDE-9645
Cache of resolved types is cleaned before build.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2011-09-02 23:40:12 UTC (rev 34505)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2011-09-02 23:44:39 UTC (rev 34506)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector;
+import org.jboss.tools.common.util.TypeResolutionCache;
import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.PageContextFactory;
@@ -84,6 +85,7 @@
*/
protected IProject[] build(int kind, Map<String,String> args, IProgressMonitor monitor)
throws CoreException {
+ TypeResolutionCache.getInstance().clean();
KbProject sp = getKbProject();
if(sp == null) {
return null;
14 years, 4 months
JBoss Tools SVN: r34505 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-02 19:40:12 -0400 (Fri, 02 Sep 2011)
New Revision: 34505
Added:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/TypeResolutionCache.java
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java
Log:
JBIDE-9645
https://issues.jboss.org/browse/JBIDE-9645
Cache of resolved types is cleaned before build.
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2011-09-02 23:39:37 UTC (rev 34504)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2011-09-02 23:40:12 UTC (rev 34505)
@@ -12,13 +12,10 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.IAnnotatable;
@@ -71,91 +68,10 @@
return resolveType(type, typeName);
}
- static String NULL = ";;;"; //$NON-NLS-1$
-
- static class Resolved {
- IType type;
- Map<String, String> types = new HashMap<String, String>();
- Resolved(IType type) {
- this.type = type;
- }
-
- void setType(IType type) {
- this.type = type;
- types.clear();
- }
- }
-
- static Map<String,Resolved> resolved = new HashMap<String, Resolved>();
-
- static String getKey(IType type) {
- String n = type.getFullyQualifiedName();
- IJavaProject jp = type.getJavaProject();
- if(jp == null) return n;
- IProject p = jp.getProject();
- if(p == null || !p.isAccessible()) return n;
- return p.getName() + ":" + n; //$NON-NLS-1$
- }
public static String resolveType(IType type, String typeName) {
- if(type == null) return null;
- if(type.isBinary() || typeName == null) return typeName;
- int i = typeName.indexOf("<");
- if(i >= 0) {
- int j = typeName.lastIndexOf(">");
- if(j >= i) {
-// typeName = typeName.substring(0, i);
- }
- }
-
- String n = getKey(type);
- Resolved r = resolved.get(n);
- if(r == null) {
- r = new Resolved(type);
- resolved.put(n, r);
-// if(resolved.size() % 100 == 0) {
-// System.out.println("-->" + resolved.size() + " " + n); //$NON-NLS-1$ //$NON-NLS-2$
-// }
- }
- if(r.type != type) {
- r.setType(type);
- }
-
- String result = r.types.get(typeName);
-
- if(result != null) {
- return (result == NULL) ? null : result;
- }
-
- result = __resolveType(type, typeName);
-
- String nresult = result == null ? NULL : result;
-
- r.types.put(typeName, nresult);
-
-// System.out.println(n + " " + typeName);
-
- return result;
-
+ return TypeResolutionCache.getInstance().resolveType(type, typeName);
}
- private static String __resolveType(IType type, String typeName) {
- if(type == null || typeName == null) return null;
- try {
- String resolvedArray[][] = type.resolveType(typeName);
-// resolvedArray == null for primitive types
- if(resolvedArray == null) return typeName;
- typeName = ""; //$NON-NLS-1$
- for (int i = 0; i < resolvedArray[0].length; i++)
- typeName += (!"".equals(typeName) ? "." : "") + resolvedArray[0][i]; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return typeName;
- } catch (JavaModelException e) {
- CommonPlugin.getPluginLog().logError(e);
- } catch (IllegalArgumentException ee) {
- System.out.println("Illegal " + typeName);
- }
- return null;
- }
-
public static IType findType(IJavaProject javaProject, String qualifiedName) throws JavaModelException {
if(qualifiedName == null || qualifiedName.length() == 0) return null;
IType type = javaProject.findType(qualifiedName);
Added: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/TypeResolutionCache.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/TypeResolutionCache.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/TypeResolutionCache.java 2011-09-02 23:40:12 UTC (rev 34505)
@@ -0,0 +1,98 @@
+package org.jboss.tools.common.util;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.common.CommonPlugin;
+
+public class TypeResolutionCache {
+ private static TypeResolutionCache instance = new TypeResolutionCache();
+
+ public static TypeResolutionCache getInstance() {
+ return instance;
+ }
+
+ static class Resolved {
+ IType type;
+ Map<String, String> types = new HashMap<String, String>();
+ Resolved(IType type) {
+ this.type = type;
+ }
+
+ void setType(IType type) {
+ this.type = type;
+ types.clear();
+ }
+ }
+
+ static String NULL = ";;;"; //$NON-NLS-1$
+ Map<String,Resolved> resolved = new HashMap<String, Resolved>();
+
+ private TypeResolutionCache() {}
+
+ public String resolveType(IType type, String typeName) {
+ if(type == null) return null;
+ if(type.isBinary() || typeName == null) return typeName;
+
+ String n = getKey(type);
+ Resolved r = resolved.get(n);
+ if(r == null) {
+ r = new Resolved(type);
+ resolved.put(n, r);
+// if(resolved.size() % 100 == 0) {
+// System.out.println("-->" + resolved.size() + " " + n); //$NON-NLS-1$ //$NON-NLS-2$
+// }
+ } else if(r.type != type) {
+ r.setType(type);
+ }
+
+ String result = r.types.get(typeName);
+ if(result != null) {
+ return (result == NULL) ? null : result;
+ }
+
+ result = __resolveType(type, typeName);
+
+ r.types.put(typeName, result == null ? NULL : result);
+ return result;
+
+ }
+
+ public void clean() {
+ resolved = new HashMap<String, Resolved>();
+ }
+
+ private String __resolveType(IType type, String typeName) {
+ if(type == null || typeName == null) return null;
+ try {
+ String resolvedArray[][] = type.resolveType(typeName);
+// resolvedArray == null for primitive types
+ if(resolvedArray == null) return typeName;
+ typeName = ""; //$NON-NLS-1$
+ for (int i = 0; i < resolvedArray[0].length; i++)
+ typeName += (!"".equals(typeName) ? "." : "") + resolvedArray[0][i]; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return typeName;
+ } catch (JavaModelException e) {
+ CommonPlugin.getPluginLog().logError(e);
+ } catch (IllegalArgumentException e) {
+ CommonPlugin.getPluginLog().logError(e);
+ }
+ return null;
+ }
+
+ private String getKey(IType type) {
+ String n = type.getFullyQualifiedName();
+ IJavaProject jp = type.getJavaProject();
+ if(jp == null) return n;
+ IProject p = jp.getProject();
+ if(p == null || !p.isAccessible()) return n;
+ return p.getName() + ":" + n; //$NON-NLS-1$
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/TypeResolutionCache.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 4 months
JBoss Tools SVN: r34504 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: resources/tck/tests/jbt/resolution/cache and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-02 19:39:37 -0400 (Fri, 02 Sep 2011)
New Revision: 34504
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/A.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/B.changed
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/B.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/C.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolvedTypesCacheTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
JBIDE-9645
https://issues.jboss.org/browse/JBIDE-9645
Cache of resolved types should be cleaned before build. Automatic test added that would fail if cache is not cleaned.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/A.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/A.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/A.java 2011-09-02 23:39:37 UTC (rev 34504)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.cache;
+
+import javax.inject.Inject;
+
+public class A {
+ @Inject B.D a;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/A.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/B.changed
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/B.changed (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/B.changed 2011-09-02 23:39:37 UTC (rev 34504)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.cache;
+
+public class B extends C {
+ public static class D {}
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/B.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/B.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/B.java 2011-09-02 23:39:37 UTC (rev 34504)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.cache;
+
+public class B extends C {
+// public static class D {}
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/B.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/C.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/C.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/C.java 2011-09-02 23:39:37 UTC (rev 34504)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.resolution.cache;
+
+public class C {
+ public static class D {}
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/resolution/cache/C.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-02 22:34:19 UTC (rev 34503)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-02 23:39:37 UTC (rev 34504)
@@ -38,6 +38,7 @@
import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.QualifierWithMembersTest;
+import org.jboss.tools.cdi.core.test.tck.ResolvedTypesCacheTest;
import org.jboss.tools.cdi.core.test.tck.ScopeDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.SelectedAlternativeTest;
import org.jboss.tools.cdi.core.test.tck.StereotypeDefinitionTest;
@@ -104,6 +105,7 @@
suite.addTestSuite(DynamicLookupTest.class);
suite.addTestSuite(AmbiguousDependencyTest.class);
suite.addTestSuite(UnsatisfiedDependencyTest.class);
+ suite.addTestSuite(ResolvedTypesCacheTest.class);
// Validation tests
suite.addTestSuite(DefenitionErrorsValidationTest.class);
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolvedTypesCacheTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolvedTypesCacheTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolvedTypesCacheTest.java 2011-09-02 23:39:37 UTC (rev 34504)
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.core.test.tck;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IField;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.util.EclipseJavaUtil;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ *
+ * EXECUTE: Create beans in cdi project
+ *
+ * public class A {
+ * @Inject B.D a;
+ * }
+ *
+ * public class B extends C {
+ * }
+ *
+ * public class C {
+ * public static class D {}
+ * }
+ * ASSERT: Injection point is resolved to C.D.
+ * EXECUTE: copy declaration of class D into class B and wait for the incremental build.
+ * FAILURE: Injection point is still resolved to C.D
+ * ASSERT: Injection point is resolved to B.D
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class ResolvedTypesCacheTest extends TCKTest {
+ static String PATH_A = "JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/cache/A.java";
+ static String PATH_B = "JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/cache/B.java";
+ static String PATH_B_CHANGED = "JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/cache/B.changed";
+ static String PATH_C = "JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/cache/C.java";
+
+ public void testCache() throws CoreException, IOException {
+ IJavaProject javaProject = EclipseResourceUtil.getJavaProject(tckProject);
+ IType t = EclipseJavaUtil.findType(javaProject, "org.jboss.jsr299.tck.tests.jbt.resolution.cache.A");
+ assertEquals("org.jboss.jsr299.tck.tests.jbt.resolution.cache.C.D", EclipseJavaUtil.resolveType(t, "B.D"));
+
+ IInjectionPointField injectionPoint = getInjectionPointField(PATH_A, "a");
+ assertNotNull(injectionPoint);
+ Set<IBean> bs = cdiProject.getBeans(true, injectionPoint);
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ assertEquals("org.jboss.jsr299.tck.tests.jbt.resolution.cache.C$D", b.getBeanClass().getFullyQualifiedName());
+
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ IFile bFile = tckProject.getFile(new Path(PATH_B));
+ IFile changedFile = tckProject.getFile(new Path(PATH_B_CHANGED));
+ bFile.setContents(changedFile.getContents(), IFile.FORCE, new NullProgressMonitor());
+ tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+
+ t = EclipseJavaUtil.findType(javaProject, "org.jboss.jsr299.tck.tests.jbt.resolution.cache.A");
+ assertEquals("org.jboss.jsr299.tck.tests.jbt.resolution.cache.B.D", EclipseJavaUtil.resolveType(t, "B.D"));
+
+ injectionPoint = getInjectionPointField(PATH_A, "a");
+ bs = cdiProject.getBeans(true, injectionPoint);
+ assertEquals(1, bs.size());
+ b = bs.iterator().next();
+ assertEquals("org.jboss.jsr299.tck.tests.jbt.resolution.cache.B$D", b.getBeanClass().getFullyQualifiedName());
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ResolvedTypesCacheTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 4 months
JBoss Tools SVN: r34503 - in trunk/jbpm: features/org.jbpm.gd.jpdl.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-02 18:34:19 -0400 (Fri, 02 Sep 2011)
New Revision: 34503
Modified:
trunk/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml
trunk/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml
trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml
Log:
seriously, the manifests and poms have to have the same versions. Geez.
Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml 2011-09-02 20:07:49 UTC (rev 34502)
+++ trunk/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml 2011-09-02 22:34:19 UTC (rev 34503)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.jbpm.features</groupId>
<artifactId>org.jboss.tools.jbpm3.feature</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml
===================================================================
--- trunk/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml 2011-09-02 20:07:49 UTC (rev 34502)
+++ trunk/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml 2011-09-02 22:34:19 UTC (rev 34503)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.jbpm.features</groupId>
<artifactId>org.jbpm.gd.jpdl.feature</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml 2011-09-02 20:07:49 UTC (rev 34502)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml 2011-09-02 22:34:19 UTC (rev 34503)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.jbpm.plugins</groupId>
<artifactId>org.jbpm.gd.jpdl</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
14 years, 4 months
JBoss Tools SVN: r34502 - in branches/jbosstools-3.2.x/jbpm: features/org.jbpm.gd.jpdl.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-02 16:07:49 -0400 (Fri, 02 Sep 2011)
New Revision: 34502
Modified:
branches/jbosstools-3.2.x/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml
branches/jbosstools-3.2.x/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml
branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml
Log:
bump pom.xml version up to reflect changes in matching features/plugins
Modified: branches/jbosstools-3.2.x/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml 2011-09-02 19:37:58 UTC (rev 34501)
+++ branches/jbosstools-3.2.x/jbpm/features/org.jboss.tools.jbpm3.feature/pom.xml 2011-09-02 20:07:49 UTC (rev 34502)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.jbpm.features</groupId>
<artifactId>org.jboss.tools.jbpm3.feature</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml 2011-09-02 19:37:58 UTC (rev 34501)
+++ branches/jbosstools-3.2.x/jbpm/features/org.jbpm.gd.jpdl.feature/pom.xml 2011-09-02 20:07:49 UTC (rev 34502)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.jbpm.features</groupId>
<artifactId>org.jbpm.gd.jpdl.feature</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml 2011-09-02 19:37:58 UTC (rev 34501)
+++ branches/jbosstools-3.2.x/jbpm/plugins/org.jbpm.gd.jpdl/pom.xml 2011-09-02 20:07:49 UTC (rev 34502)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.jbpm.plugins</groupId>
<artifactId>org.jbpm.gd.jpdl</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.3.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
14 years, 4 months
JBoss Tools SVN: r34501 - 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: 2011-09-02 15:37:58 -0400 (Fri, 02 Sep 2011)
New Revision: 34501
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
Log:
JBIDE-9271
https://issues.jboss.org/browse/JBIDE-9271
Improved algorithm that determines if beans should be reused.
Only for 3.3.0.M4.
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 2011-09-02 18:00:41 UTC (rev 34500)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-09-02 19:37:58 UTC (rev 34501)
@@ -97,6 +97,9 @@
private Set<IDecorator> decorators = new HashSet<IDecorator>();
private Set<IInterceptor> interceptors = new HashSet<IInterceptor>();
+ private Set<IType> allTypes = new HashSet<IType>();
+ private Map<TypeDefinition, ClassBean> definitionToClassbeans = new HashMap<TypeDefinition, ClassBean>();
+
private Map<String, Set<IInjectionPoint>> injectionPointsByType = new HashMap<String, Set<IInjectionPoint>>();
BeansXMLData allBeansXMLData = new BeansXMLData();
@@ -1058,17 +1061,22 @@
void rebuildBeans() {
List<TypeDefinition> typeDefinitions = n.getAllTypeDefinitions();
List<IBean> beans = new ArrayList<IBean>();
+
+ Set<IType> newAllTypes = new HashSet<IType>();
+ for (TypeDefinition d: typeDefinitions) {
+ newAllTypes.add(d.getType());
+ }
+ Map<TypeDefinition, ClassBean> newDefinitionToClassbeans = new HashMap<TypeDefinition, ClassBean>();
Map<IType, IClassBean> newClassBeans = new HashMap<IType, IClassBean>();
+
+ int updateLevel = getUpdateLevel(newAllTypes);
ImplementationCollector ic = new ImplementationCollector(typeDefinitions);
for (TypeDefinition typeDefinition : typeDefinitions) {
- if(typeDefinition.isVetoed()) {
- continue;
- }
-
- ClassBean bean = (ClassBean)classBeans.get(typeDefinition.getType());
- if(bean != null && (bean.getDefinition() == typeDefinition)) {
+ ClassBean bean = definitionToClassbeans.get(typeDefinition);
+ if(bean != null && (bean.getDefinition() == typeDefinition)
+ && (updateLevel == 0 || (updateLevel == 1 && typeDefinition.getType().isBinary()))) {
//Type definitions are rebuilt when changed, otherwise old bean should be reused.
bean.cleanCache();
} else {
@@ -1084,15 +1092,19 @@
bean.setParent(this);
bean.setDefinition(typeDefinition);
}
+
+ newDefinitionToClassbeans.put(typeDefinition, bean);
- if(typeDefinition.hasBeanConstructor()) {
- beans.add(bean);
- newClassBeans.put(typeDefinition.getType(), bean);
- }
+ if(!typeDefinition.isVetoed()) {
+ if(typeDefinition.hasBeanConstructor()) {
+ beans.add(bean);
+ newClassBeans.put(typeDefinition.getType(), bean);
+ }
- Set<IProducer> ps = bean.getProducers();
- for (IProducer producer: ps) {
- beans.add(producer);
+ Set<IProducer> ps = bean.getProducers();
+ for (IProducer producer: ps) {
+ beans.add(producer);
+ }
}
}
@@ -1128,6 +1140,8 @@
}
classBeans = newClassBeans;
+ definitionToClassbeans = newDefinitionToClassbeans;
+ allTypes = newAllTypes;
for (IBean bean: beans) {
addBean(bean);
}
@@ -1136,6 +1150,42 @@
}
+ /**
+ * Compares sets this.allTypes and newAllTypes
+ * Returns
+ * 0 if sets are identical,
+ * all beans may be reused;
+ * 2 if some binary type is present in exactly one of two sets
+ * no bean may be reused;
+ * 1 otherwize (if some non-binary types present in exactly one of two sets)
+ * only beans based binary types may be reused.
+ * Note that bean will be reused, if its type definition object is not modified.
+ * @param newAllTypes
+ * @return
+ */
+ private int getUpdateLevel(Set<IType> newAllTypes) {
+ int result = 0;
+ for (IType t: allTypes) {
+ if(!t.exists() || !newAllTypes.contains(t)) {
+ if(t.isBinary()) {
+ return 2;
+ } else {
+ result = 1;
+ }
+ }
+ }
+ for (IType t: newAllTypes) {
+ if(!allTypes.contains(t)) {
+ if(t.isBinary()) {
+ return 2;
+ } else {
+ result = 1;
+ }
+ }
+ }
+ return result;
+ }
+
public void addBean(IBean bean) {
if(((CDIElement)bean).getDeclaringProject() != this && getNature().getClassPath().hasPath(bean.getSourcePath())) {
//Prevented double bean from library common for this and used project
14 years, 4 months
JBoss Tools SVN: r34500 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: messages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-09-02 14:00:41 -0400 (Fri, 02 Sep 2011)
New Revision: 34500
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
Log:
JBIDE-9634
Replace EL prefixed used in content assist to be #{...} instead of ${...} by default
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2011-09-02 17:04:01 UTC (rev 34499)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2011-09-02 18:00:41 UTC (rev 34500)
@@ -718,7 +718,7 @@
* @return default EL prefix
*/
public String getDefaultELPrefix() {
- return EL_DOLLAR_PREFIX;
+ return EL_NUMBER_PREFIX;
}
/**
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-09-02 17:04:01 UTC (rev 34499)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2011-09-02 18:00:41 UTC (rev 34500)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jst.jsp.contentassist.computers;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -175,8 +176,8 @@
if(!prefix.isELStarted()) {
AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true,
getDefaultELPrefix() + "}" + (prefix.isAttributeValue() && prefix.hasOpenQuote() && !prefix.hasCloseQuote() ? String.valueOf(prefix.getQuoteChar()) : ""), //$NON-NLS-1$ //$NON-NLS-2$
- getOffset(), 0, 2, JSF_EL_PROPOSAL_IMAGE, JstUIMessages.JspContentAssistProcessor_NewELExpression,
- null, JstUIMessages.JspContentAssistProcessor_NewELExpressionAttrInfo, TextProposal.R_XML_ATTRIBUTE_VALUE_TEMPLATE);
+ getOffset(), 0, 2, JSF_EL_PROPOSAL_IMAGE, MessageFormat.format(JstUIMessages.JspContentAssistProcessor_NewELExpression, getDefaultELPrefix()),
+ null, MessageFormat.format(JstUIMessages.JspContentAssistProcessor_NewELExpressionAttrInfo, getDefaultELPrefix()), TextProposal.R_XML_ATTRIBUTE_VALUE_TEMPLATE);
contentAssistRequest.addProposal(proposal);
return;
@@ -325,8 +326,8 @@
if (prefix == null || !prefix.isELStarted()) {
AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(true, getDefaultELPrefix()+ "}", //$NON-NLS-1$
contentAssistRequest.getReplacementBeginPosition(),
- 0, 2, JSF_EL_PROPOSAL_IMAGE, JstUIMessages.JspContentAssistProcessor_NewELExpression, null,
- JstUIMessages.FaceletPageContectAssistProcessor_NewELExpressionTextInfo, TextProposal.R_TAG_INSERTION + 1);
+ 0, 2, JSF_EL_PROPOSAL_IMAGE, MessageFormat.format(JstUIMessages.JspContentAssistProcessor_NewELExpression, getDefaultELPrefix()), null,
+ MessageFormat.format(JstUIMessages.FaceletPageContectAssistProcessor_NewELExpressionTextInfo, getDefaultELPrefix()), TextProposal.R_TAG_INSERTION + 1);
contentAssistRequest.addProposal(proposal);
return;
@@ -1236,5 +1237,4 @@
protected int getTagInsertionBaseRelevance() {
return TextProposal.R_XML_TAG_INSERTION;
}
-
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2011-09-02 17:04:01 UTC (rev 34499)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2011-09-02 18:00:41 UTC (rev 34500)
@@ -21,7 +21,7 @@
ADD_FONT_FAMILY_TIP=Add font family
REMOVE_FONT_FAMILY_TIP=Remove font family
-FaceletPageContectAssistProcessor_NewELExpressionTextInfo=${}
+FaceletPageContectAssistProcessor_NewELExpressionTextInfo={0}\}
FONT_FAMILY_DIALOG_TITLE=Choose font family
BUTTON_APPLY=Apply
BUTTON_CLEAR=Clear
@@ -87,8 +87,8 @@
DEFAULT_TEXT_FOR_BROWSER_PREVIEW=Double click to edit preview.
JspContentAssistProcessor_CloseELExpression=Close JSF EL Expression
JspContentAssistProcessor_CloseELExpressionInfo=}
-JspContentAssistProcessor_NewELExpression=New JSF EL Expression - Create a new attribute value with ${}
-JspContentAssistProcessor_NewELExpressionAttrInfo=${}
+JspContentAssistProcessor_NewELExpression=New JSF EL Expression - Create a new attribute value with {0}\}
+JspContentAssistProcessor_NewELExpressionAttrInfo={0}\}
JSPDialogCellEditor_CodeAssist=code assist
JSPDialogCellEditor_EditAttribute=Edit {0}
JSPDialogContentProposalProvider_CloseELExpression=Close EL Expression
14 years, 4 months
JBoss Tools SVN: r34499 - trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-02 13:04:01 -0400 (Fri, 02 Sep 2011)
New Revision: 34499
Modified:
trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/TestUtil.java
Log:
fixed typo in class name
Modified: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/TestUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/TestUtil.java 2011-09-02 15:59:24 UTC (rev 34498)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/TestUtil.java 2011-09-02 17:04:01 UTC (rev 34499)
@@ -40,39 +40,7 @@
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
ValidationFramework.getDefault().suspendAllValidation(false);
try {
- new EnabledValidatorsOperation(project,false){
- public void run(IProgressMonitor progressMonitor) throws OperationCanceledException {
- try {
- // In order to check whether or not the monitor has been canceled, the monitor must not be null.
- if (progressMonitor == null)return;
- IProject project = getProject();
- if (ValidationFramework.getDefault().isSuspended(project))return;
- if (ValManager.getDefault().isDisabled(project))return;
-
- if (!areValidatorsEnabled()) {
- // save some processing time...
- return;
- }
-
- final WorkbenchReporter reporter = new WorkbenchReporter(getProject(), progressMonitor) {
- public void addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator validator, org.eclipse.wst.validation.internal.provisional.core.IMessage message) {
- super.addMessage(validator, message);
- System.out.println(message);
- };
- };
-
- try {
- // Periodically check if the user has canceled the operation
- checkCanceled(reporter);
- preValidate(reporter);
- validate(reporter);
- } catch (CoreException e) {
- ValidationPlugin.getPlugin().handleException(e);
- }
- } finally {
- }
- }
- }.run(new NullProgressMonitor());
+ new EnabledValidatorsOperation(project,false).run(new NullProgressMonitor());
} finally {
ValidationFramework.getDefault().suspendAllValidation(true);
}
@@ -87,7 +55,7 @@
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
ValidationFramework.getDefault().suspendAllValidation(false);
try {
- new IncrimantalValidatorOperation(project, resources).run(new NullProgressMonitor());
+ new IncriminalValidatorOperation(project, resources).run(new NullProgressMonitor());
// new EnabledIncrementalValidatorsOperation(project, resources).run(new NullProgressMonitor());
// new ValidatorSubsetOperation(project,"java",resource,false).run(new NullProgressMonitor());
} catch (OperationCanceledException e) {
@@ -101,8 +69,8 @@
}
}
- private static class IncrimantalValidatorOperation extends ValidatorSubsetOperation {
- public IncrimantalValidatorOperation(IProject project, Object[] changedResources) throws InvocationTargetException {
+ private static class IncriminalValidatorOperation extends ValidatorSubsetOperation {
+ public IncriminalValidatorOperation(IProject project, Object[] changedResources) throws InvocationTargetException {
super(project, shouldForce(changedResources), RegistryConstants.ATT_RULE_GROUP_DEFAULT, false);
ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true)));
14 years, 4 months
JBoss Tools SVN: r34498 - branches/jbosstools-3.3.0.M3/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-02 11:59:24 -0400 (Fri, 02 Sep 2011)
New Revision: 34498
Modified:
branches/jbosstools-3.3.0.M3/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java
Log:
https://issues.jboss.org/browse/JBIDE-9637 On workspaces with complex dependencies between CDI projects, CDI validation self-disables after full build.
Modified: branches/jbosstools-3.3.0.M3/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java
===================================================================
--- branches/jbosstools-3.3.0.M3/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java 2011-09-02 15:23:11 UTC (rev 34497)
+++ branches/jbosstools-3.3.0.M3/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java 2011-09-02 15:59:24 UTC (rev 34498)
@@ -66,31 +66,33 @@
Set<IProject> rootProjects = validationContextManager.getRootProjects();
IStatus status = OK_STATUS;
synchronized (validatingProjects) {
- for (IProject rootProject : rootProjects) {
- if(validatingProjects.contains(rootProject)) {
- return OK_STATUS;
- }
- validatingProjects.add(rootProject);
+ // Validate root projects that is not being validated yet.
+ rootProjects.removeAll(validatingProjects);
+ if(rootProjects.isEmpty()) {
+ // We don't have projects to validate.
+ return OK_STATUS;
}
+ validatingProjects.addAll(rootProjects);
}
try {
validationContextManager.clearValidatedProjectsList();
Set<IFile> changedFiles = validationHelper.getChangedFiles();
if(!changedFiles.isEmpty()) {
- status = validate(changedFiles, validationHelper, reporter);
+ status = validate(changedFiles, validationHelper, reporter, rootProjects);
} else if(!validationContextManager.getRegisteredFiles().isEmpty()) {
validationContextManager.clearAllResourceLinks();
- status = validateAll(validationHelper, reporter);
+ status = validateAll(validationHelper, reporter, rootProjects);
}
} finally {
- if(validationContextManager!=null) {
- validationContextManager.clearRegisteredFiles();
- }
- validationHelper.cleanup(); // See https://issues.jboss.org/browse/JBIDE-8726
- synchronized (validatingProjects) {
- for (IProject rootProject : rootProjects) {
- validatingProjects.remove(rootProject);
+ try {
+ if(validationContextManager!=null) {
+ validationContextManager.clearRegisteredFiles();
}
+ validationHelper.cleanup(); // See https://issues.jboss.org/browse/JBIDE-8726
+ } finally {
+ synchronized (validatingProjects) {
+ validatingProjects.removeAll(rootProjects);
+ }
}
}
return status;
@@ -103,10 +105,9 @@
}
}
- private IStatus validate(Set<IFile> changedFiles, ContextValidationHelper validationHelper, IReporter reporter) throws ValidationException {
+ private IStatus validate(Set<IFile> changedFiles, ContextValidationHelper validationHelper, IReporter reporter, Set<IProject> rootProjects) throws ValidationException {
IValidationContextManager validationContextManager = validationHelper.getValidationContextManager();
List<IValidator> validators = validationContextManager.getValidators();
- Set<IProject> rootProjects = validationContextManager.getRootProjects();
removeMarkers(changedFiles);
for (IValidator validator : validators) {
for (IProject rootProject : rootProjects) {
@@ -119,10 +120,9 @@
return OK_STATUS;
}
- private IStatus validateAll(ContextValidationHelper validationHelper, IReporter reporter) throws ValidationException {
+ private IStatus validateAll(ContextValidationHelper validationHelper, IReporter reporter, Set<IProject> rootProjects) throws ValidationException {
IValidationContextManager validationContextManager = validationHelper.getValidationContextManager();
List<IValidator> validators = validationContextManager.getValidators();
- Set<IProject> rootProjects = validationContextManager.getRootProjects();
removeMarkers(validationHelper.getProjectSetRegisteredFiles());
for (IValidator validator : validators) {
for (IProject rootProject : rootProjects) {
14 years, 4 months
JBoss Tools SVN: r34497 - in trunk: runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-09-02 11:23:11 -0400 (Fri, 02 Sep 2011)
New Revision: 34497
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/.EgitUtils.java.swp
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java
Log:
[JBDS-1795] set SearchRuntimePathDialog to be modal. Furthermore I set SearchRuntimePathDialog and UsageReportEnablementDialog to not block on open.
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/.EgitUtils.java.swp
===================================================================
(Binary files differ)
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-09-02 14:23:51 UTC (rev 34496)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-09-02 15:23:11 UTC (rev 34497)
@@ -65,8 +65,9 @@
public SearchRuntimePathDialog(Shell parent, Set<RuntimePath> runtimePaths, boolean needRefresh, int heightHint) {
super(parent);
- setShellStyle(SWT.CLOSE | SWT.MAX | SWT.TITLE | SWT.BORDER
- | SWT.RESIZE | getDefaultOrientation());
+// setShellStyle(SWT.CLOSE | SWT.MAX | SWT.TITLE | SWT.BORDER
+// | SWT.RESIZE | getDefaultOrientation());
+ setBlockOnOpen(false);
this.runtimePaths = runtimePaths;
this.needRefresh = needRefresh;
this.heightHint = heightHint;
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2011-09-02 14:23:51 UTC (rev 34496)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/reporting/UsageReportEnablementDialog.java 2011-09-02 15:23:11 UTC (rev 34497)
@@ -35,6 +35,7 @@
public UsageReportEnablementDialog(IShellProvider parentShell, IUsageBranding branding) {
super(parentShell);
+ setBlockOnOpen(false);
this.branding = branding;
}
14 years, 4 months