JBoss Tools SVN: r30083 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-28 21:06:58 -0400 (Mon, 28 Mar 2011)
New Revision: 30083
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/CDIExtensionImpl.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/CDIExtensionImpl.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/CDIExtensionImpl.java 2011-03-29 01:06:29 UTC (rev 30082)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/CDIExtensionImpl.java 2011-03-29 01:06:58 UTC (rev 30083)
@@ -4,4 +4,8 @@
public class CDIExtensionImpl implements ICDIExtension {
+ public Object getAdapter(Class adapter) {
+ return null;
+ }
+
}
13 years, 1 month
JBoss Tools SVN: r30082 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: core/extension and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-03-28 21:06:29 -0400 (Mon, 28 Mar 2011)
New Revision: 30082
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/PackageDefinition.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
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/scanner/CDIBuilderDelegate.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/FileSet.java
Log:
JBIDE-3120
https://issues.jboss.org/browse/JBIDE-3120
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-03-29 00:38:33 UTC (rev 30081)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -34,6 +34,7 @@
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageDeclaration;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
@@ -337,8 +338,15 @@
if(f.getName().endsWith(".java")) {
ICompilationUnit unit = EclipseUtil.getCompilationUnit(f);
if(unit!=null) {
- IType[] ts = unit.getTypes();
- fileSet.add(f.getFullPath(), ts);
+ if(f.getName().equals("package-info.java")) {
+ IPackageDeclaration[] pkg = unit.getPackageDeclarations();
+ if(pkg != null && pkg.length > 0) {
+ fileSet.add(f.getFullPath(), pkg[0]);
+ }
+ } else {
+ IType[] ts = unit.getTypes();
+ fileSet.add(f.getFullPath(), ts);
+ }
}
}
else if(path.segmentCount() == srcs[i].segmentCount() + 2
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java 2011-03-29 00:38:33 UTC (rev 30081)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionFactory.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -24,6 +24,18 @@
/**
* Loads Eclipse extension point 'org.jboss.tools.cdi.core.cdiextensions'
+ * Element:
+ * 'cdiextension'
+ * Attributes:
+ * 'runtime' - Qualified name of CDI runtime extension implementation class.
+ * 'class' - Qualified name of JBoss Tools CDI model extension implementation class.
+ * 'features' - It is not planned to add regular methods to this interface,
+ * all features that are to be provided by implementations, will be available
+ * through IAdaptable. In that way, adding to core support of a new feature
+ * will not require to implement new methods in existing extensions.
+ * In order to efficiently request only relevant implementations,
+ * extensions must register supported features in this attribute.
+ *
* @author Viacheslav Kabanovich
*
*/
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-03-29 00:38:33 UTC (rev 30081)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/ICDIExtension.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -10,18 +10,26 @@
******************************************************************************/
package org.jboss.tools.cdi.core.extension;
+import org.eclipse.core.runtime.IAdaptable;
+
/**
* This object represents CDI runtime extension in JBoss Tools CDI model.
* It is not necessarily one to one mapping between CDI runtime extension implementation classes
* and JBoss Tools CDI model extension implementation classes.
* Mapping is set by Eclipse extension point 'org.jboss.tools.cdi.core.cdiextensions'
- * where attribute 'id' is assigned to a CDI runtime extension implementation class qualified name
+ * where attribute 'runtime' is assigned to a CDI runtime extension implementation class qualified name
* and attribute 'class' is assigned to a JBoss Tools CDI model extension implementation class
* qualified name.
+ * It is not planned to add regular methods to this interface, all features that are to be provided
+ * by implementations, will be available through IAdaptable. In that way, adding to core support of
+ * a new feature will not require to implement new methods in existing extensions. In order to
+ * let core efficiently request only relevant implementations, extensions must register supported
+ * features in attribute 'features' of extension point.
*
+ *
* @author Viacheslav Kabanovich
*
*/
-public interface ICDIExtension {
+public interface ICDIExtension extends IAdaptable {
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2011-03-29 00:38:33 UTC (rev 30081)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -59,7 +59,7 @@
}
String name = annotation.getElementName();
annotationTypeName = EclipseJavaUtil.resolveType(declaringType, name);
- type = EclipseJavaUtil.findType(declaringType.getJavaProject(), annotationTypeName);
+ type = EclipseJavaUtil.findType(annotation.getJavaProject(), annotationTypeName);
} catch (JavaModelException e) {
CDICorePlugin.getDefault().logError(e);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-03-29 00:38:33 UTC (rev 30081)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IAnnotatable;
import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -62,7 +63,7 @@
}
protected void init(IType contextType, DefinitionContext context) throws CoreException {
- resource = contextType.getResource();
+ resource = ((IJavaElement)member).getResource();
IAnnotation[] ts = member.getAnnotations();
for (int i = 0; i < ts.length; i++) {
AnnotationDeclaration a = new AnnotationDeclaration();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-03-29 00:38:33 UTC (rev 30081)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -38,6 +38,9 @@
private Map<String, TypeDefinition> typeDefinitions = new HashMap<String, TypeDefinition>();
private Map<String, AnnotationDefinition> annotations = new HashMap<String, AnnotationDefinition>();
+ private Set<String> packages = new HashSet<String>();
+ private Map<String, PackageDefinition> packageDefinitions = new HashMap<String, PackageDefinition>();
+
private Map<IPath, BeansXMLDefinition> beanXMLs = new HashMap<IPath, BeansXMLDefinition>();
private DefinitionContext workingCopy;
@@ -53,6 +56,10 @@
copy.types.addAll(types);
copy.typeDefinitions.putAll(typeDefinitions);
copy.annotations.putAll(annotations);
+
+ copy.packages.addAll(packages);
+ copy.packageDefinitions.putAll(packageDefinitions);
+
for (IPath p: resources.keySet()) {
Set<String> set = resources.get(p);
if(set != null) {
@@ -112,6 +119,24 @@
}
}
+ public void addPackage(IPath file, String packageName, PackageDefinition def) {
+ if(file != null) {
+ Set<String> ts = resources.get(file);
+ if(ts == null) {
+ ts = new HashSet<String>();
+ resources.put(file, ts);
+ }
+ ts.add(packageName);
+ packages.add(packageName);
+ addToParents(file);
+ }
+ if(def != null) {
+ synchronized (packageDefinitions) {
+ packageDefinitions.put(def.getQualifiedName(), def);
+ }
+ }
+ }
+
public void addBeanXML(IPath path, BeansXMLDefinition def) {
synchronized (beanXMLs) {
beanXMLs.put(path, def);
@@ -137,12 +162,16 @@
childPaths.clear();
resources.clear();
types.clear();
+ packages.clear();
synchronized (typeDefinitions) {
typeDefinitions.clear();
}
synchronized (annotations) {
annotations.clear();
}
+ synchronized (packageDefinitions) {
+ packageDefinitions.clear();
+ }
synchronized (beanXMLs) {
beanXMLs.clear();
}
@@ -158,6 +187,10 @@
synchronized (annotations) {
annotations.remove(t);
}
+ packages.remove(t);
+ synchronized (packageDefinitions) {
+ packageDefinitions.remove(t);
+ }
}
synchronized (beanXMLs) {
beanXMLs.remove(path);
@@ -271,6 +304,8 @@
childPaths = workingCopy.childPaths;
typeDefinitions = workingCopy.typeDefinitions;
annotations = workingCopy.annotations;
+ packages = workingCopy.packages;
+ packageDefinitions = workingCopy.packageDefinitions;
beanXMLs = workingCopy.beanXMLs;
project.getDelegate().update();
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 2011-03-29 00:38:33 UTC (rev 30081)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -19,6 +19,7 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInterceptorBinding;
@@ -117,7 +118,7 @@
String p = params[i].trim();
int pi = params[i].indexOf(p);
- ValueInfo v = new ValueInfo();
+ ValueInfo v = new CheckingValueInfo(method);
v.setValue(params[i]);
v.valueStartPosition = start + pi;
v.valueLength = p.length();
@@ -126,7 +127,7 @@
String[] tokens = getParamTokens(p);
for (String q: tokens) {
if(!q.startsWith("@")) continue;
- v = new ValueInfo();
+ v = new CheckingValueInfo(method);
v.setValue(q);
v.valueStartPosition = start + params[i].indexOf(q);
v.valueLength = q.length();
@@ -270,4 +271,42 @@
return result.toArray(new String[0]);
}
+ class CheckingValueInfo extends ValueInfo {
+ IMethod m;
+ CheckingValueInfo(IMethod m) {
+ this.m = m;
+ }
+
+ void check() {
+ ISourceRange r = null;
+ try {
+ r = m.getSourceRange();
+ } catch (JavaModelException e) {
+ System.out.println("Method is obsolete: " + m);
+ }
+ if(r == null) {
+ valueStartPosition = 0;
+ valueLength = 0;
+ } else {
+ if(valueStartPosition + valueLength > r.getOffset() + r.getLength()) {
+ System.out.println("Method is modified: " + m);
+ valueStartPosition = 0;
+ valueLength = 0;
+ }
+ }
+
+ }
+
+ public int getStartPosition() {
+ check();
+ return valueStartPosition;
+ }
+
+ public int getLength() {
+ check();
+ return valueLength;
+ }
+
+ }
+
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/PackageDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/PackageDefinition.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/PackageDefinition.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * 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.internal.core.impl.definition;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IPackageDeclaration;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class PackageDefinition extends AbstractMemberDefinition {
+ protected String qualifiedName;
+
+ public PackageDefinition() {}
+
+ public String getQualifiedName() {
+ return qualifiedName;
+ }
+
+ public void setPackage(IPackageDeclaration pkg, DefinitionContext context) {
+ IType contextType = null;
+ ICompilationUnit u = null;
+ if(pkg.getParent() instanceof ICompilationUnit) {
+ try {
+ u = ((ICompilationUnit)pkg.getParent()).getWorkingCopy(new NullProgressMonitor());
+ contextType = u.createType("class A {}", null, false, new NullProgressMonitor());
+ } catch (JavaModelException e) {
+
+ }
+ }
+ super.setAnnotatable(pkg, contextType, context);
+ if (u != null) {
+ try {
+ u.discardWorkingCopy();
+ } catch (JavaModelException e) {
+
+ }
+ }
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/PackageDefinition.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java 2011-03-29 00:38:33 UTC (rev 30081)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/CDIBuilderDelegate.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -5,6 +5,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.jdt.core.IPackageDeclaration;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.ICDIBuilderDelegate;
@@ -12,6 +13,7 @@
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.impl.definition.BeansXMLDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext;
+import org.jboss.tools.cdi.internal.core.impl.definition.PackageDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.common.model.XModelObject;
@@ -58,6 +60,14 @@
}
}
+ Map<IPath, IPackageDeclaration> pkgs = fileSet.getPackages();
+ for (IPath f: pkgs.keySet()) {
+ IPackageDeclaration pkg = pkgs.get(f);
+ PackageDefinition def = new PackageDefinition();
+ def.setPackage(pkg, context);
+ context.addPackage(f, def.getQualifiedName(), def);
+ }
+
for (IPath f: ps) {
XModelObject beansXML = fileSet.getBeanXML(f);
if(beansXML == null) continue;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/FileSet.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/FileSet.java 2011-03-29 00:38:33 UTC (rev 30081)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/FileSet.java 2011-03-29 01:06:29 UTC (rev 30082)
@@ -8,6 +8,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.Flags;
+import org.eclipse.jdt.core.IPackageDeclaration;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.common.model.XModelObject;
@@ -17,6 +18,7 @@
private Map<IPath, Set<IType>> annotations = new HashMap<IPath, Set<IType>>();
private Map<IPath, Set<IType>> interfaces = new HashMap<IPath, Set<IType>>();
private Map<IPath, Set<IType>> classes = new HashMap<IPath, Set<IType>>();
+ private Map<IPath, IPackageDeclaration> packages = new HashMap<IPath, IPackageDeclaration>();
private Map<IPath, XModelObject> beanXMLs = new HashMap<IPath, XModelObject>();
public FileSet() {}
@@ -58,6 +60,12 @@
ts.add(type);
}
+ public void add(IPath path, IPackageDeclaration pkg) throws CoreException {
+ if(pkg == null) return;
+ allpaths.add(path);
+ packages.put(path, pkg);
+ }
+
public Set<IPath> getAllPaths() {
return allpaths;
}
@@ -78,6 +86,10 @@
return classes;
}
+ public Map<IPath, IPackageDeclaration> getPackages() {
+ return packages;
+ }
+
public XModelObject getBeanXML(IPath f) {
return beanXMLs.get(f);
}
13 years, 1 month
JBoss Tools SVN: r30081 - branches/3.3.indigo/seam/tests/org.jboss.tools.seam.core.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-03-28 20:38:33 -0400 (Mon, 28 Mar 2011)
New Revision: 30081
Modified:
branches/3.3.indigo/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
Log:
JBIDE-8641
Modified: branches/3.3.indigo/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- branches/3.3.indigo/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2011-03-29 00:36:55 UTC (rev 30080)
+++ branches/3.3.indigo/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2011-03-29 00:38:33 UTC (rev 30081)
@@ -26,7 +26,6 @@
org.eclipse.jdt.core.manipulation,
org.jboss.tools.common.el.core,
org.eclipse.jst.jee.web;bundle-version="1.0.201",
- org.eclipse.jpt.core;bundle-version="2.2.1",
org.eclipse.jst.jsp.core;bundle-version="1.2.204",
org.eclipse.wst.validation.ui;bundle-version="1.2.104",
org.jboss.tools.common.el.core,
13 years, 1 month
JBoss Tools SVN: r30080 - trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-03-28 20:36:55 -0400 (Mon, 28 Mar 2011)
New Revision: 30080
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
Log:
JBIDE-8641
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2011-03-29 00:25:42 UTC (rev 30079)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2011-03-29 00:36:55 UTC (rev 30080)
@@ -26,7 +26,6 @@
org.eclipse.jdt.core.manipulation,
org.jboss.tools.common.el.core,
org.eclipse.jst.jee.web;bundle-version="1.0.201",
- org.eclipse.jpt.core;bundle-version="2.2.1",
org.eclipse.jst.jsp.core;bundle-version="1.2.204",
org.eclipse.wst.validation.ui;bundle-version="1.2.104",
org.jboss.tools.common.el.core,
13 years, 1 month
JBoss Tools SVN: r30079 - branches/3.3.indigo/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-03-28 20:25:42 -0400 (Mon, 28 Mar 2011)
New Revision: 30079
Modified:
branches/3.3.indigo/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
Log:
JBIDE-8640
Modified: branches/3.3.indigo/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
===================================================================
--- branches/3.3.indigo/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2011-03-29 00:23:40 UTC (rev 30078)
+++ branches/3.3.indigo/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2011-03-29 00:25:42 UTC (rev 30079)
@@ -5,5 +5,5 @@
Bundle-Version: 3.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="3.5.2"
+Require-Bundle: org.eclipse.ui
Bundle-Vendor: %providerName
13 years, 1 month
JBoss Tools SVN: r30078 - trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-03-28 20:23:40 -0400 (Mon, 28 Mar 2011)
New Revision: 30078
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
Log:
JBIDE-8640
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2011-03-28 23:42:48 UTC (rev 30077)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui.capabilities/META-INF/MANIFEST.MF 2011-03-29 00:23:40 UTC (rev 30078)
@@ -5,5 +5,5 @@
Bundle-Version: 3.1.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="3.5.2"
+Require-Bundle: org.eclipse.ui
Bundle-Vendor: %providerName
13 years, 1 month
JBoss Tools SVN: r30077 - in branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-03-28 19:42:48 -0400 (Mon, 28 Mar 2011)
New Revision: 30077
Modified:
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml
Log:
JBIDE-7111 versions maintenance
Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2011-03-28 23:41:38 UTC (rev 30076)
+++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2011-03-28 23:42:48 UTC (rev 30077)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.ide.eclipse.archives.core;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-Activator: org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml 2011-03-28 23:41:38 UTC (rev 30076)
+++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml 2011-03-28 23:42:48 UTC (rev 30077)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.archives.plugins</groupId>
<artifactId>org.jboss.ide.eclipse.archives.core</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
13 years, 1 month
JBoss Tools SVN: r30076 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.core: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-03-28 19:41:38 -0400 (Mon, 28 Mar 2011)
New Revision: 30076
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml
Log:
JBIDE-7111 versions to trunk
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2011-03-28 23:34:25 UTC (rev 30075)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2011-03-28 23:41:38 UTC (rev 30076)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.ide.eclipse.archives.core;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.1.qualifier
Bundle-Activator: org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml 2011-03-28 23:34:25 UTC (rev 30075)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml 2011-03-28 23:41:38 UTC (rev 30076)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.archives.plugins</groupId>
<artifactId>org.jboss.ide.eclipse.archives.core</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
13 years, 1 month
JBoss Tools SVN: r30075 - in branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src: main/org/jboss/ide/eclipse/archives/core/build and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-03-28 19:34:25 -0400 (Mon, 28 Mar 2011)
New Revision: 30075
Modified:
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/PostBuildRefresher.java
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java
Log:
JBIDE-7111 to maintenance
Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java
===================================================================
--- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java 2011-03-28 23:27:51 UTC (rev 30074)
+++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java 2011-03-28 23:34:25 UTC (rev 30075)
@@ -15,6 +15,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -46,12 +47,14 @@
protected void executeAndLog(IArchiveNodeDelta delta) {
final IArchiveNodeDelta delta2 = delta;
- new Job(ArchivesCoreMessages.UpdatingModelJob) {
- public IStatus run(IProgressMonitor monitor) {
+ Job j = new WorkspaceJob(ArchivesCoreMessages.UpdatingModelJob) {
+ public IStatus runInWorkspace(IProgressMonitor monitor) {
ModelChangeListenerWithRefresh.super.executeAndLog(delta2);
return Status.OK_STATUS;
}
- }.schedule();
+ };
+ j.setRule(ResourcesPlugin.getWorkspace().getRoot());
+ j.schedule();
}
Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/PostBuildRefresher.java
===================================================================
--- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/PostBuildRefresher.java 2011-03-28 23:27:51 UTC (rev 30074)
+++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/PostBuildRefresher.java 2011-03-28 23:34:25 UTC (rev 30075)
@@ -4,93 +4,45 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.jboss.ide.eclipse.archives.core.model.AbstractBuildListener;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveBuildListener;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.util.PathUtils;
-public class PostBuildRefresher implements IArchiveBuildListener {
+public class PostBuildRefresher extends AbstractBuildListener {
- public void buildFailed(IArchive pkg, IStatus status) {
+ public void finishedBuildingArchive(final IArchive pkg) {
// TODO Auto-generated method stub
-
- }
-
- public void cleanArchive(IArchive pkg) {
- // TODO Auto-generated method stub
-
- }
-
- public void cleanProject(IPath project) {
- // TODO Auto-generated method stub
-
- }
-
- public void error(IArchiveNode node, IStatus[] multi) {
- // TODO Auto-generated method stub
-
- }
-
- public void fileRemoved(IArchive topLevelArchive, IArchiveFileSet fileset,
- IPath filePath) {
- // TODO Auto-generated method stub
-
- }
-
- public void fileUpdated(IArchive topLevelArchive, IArchiveFileSet fileset,
- IPath filePath) {
- // TODO Auto-generated method stub
-
- }
-
- public void finishedBuild(IPath project) {
-
- // TODO Auto-generated method stub
-
- }
-
- public void finishedBuildingArchive(IArchive pkg) {
- // TODO Auto-generated method stub
if( pkg.isDestinationInWorkspace()) {
- IPath loc = PathUtils.getGlobalLocation(pkg);
- IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(loc);
- for( int i = 0; i < files.length; i++ ) {
- try {
- files[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- } catch( CoreException ce ) {}
- }
- IContainer[] folders = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocation(loc);
- for( int i = 0; i < folders.length; i++ ) {
- try {
- folders[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- } catch( CoreException ce ) {}
- }
+ new WorkspaceJob("Refresh Project") { //$NON-NLS-1$
+ public IStatus runInWorkspace(IProgressMonitor monitor)
+ throws CoreException {
+ handlePostBuild(pkg);
+ return Status.OK_STATUS;
+ }
+ }.schedule(1000);
}
}
-
- public void finishedCollectingFileSet(IArchiveFileSet fileset) {
- // TODO Auto-generated method stub
-
+
+ private void handlePostBuild(IArchive pkg) {
+ IPath loc = PathUtils.getGlobalLocation(pkg);
+ IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(loc);
+ for( int i = 0; i < files.length; i++ ) {
+ try {
+ files[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch( CoreException ce ) {}
+ }
+ IContainer[] folders = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocation(loc);
+ for( int i = 0; i < folders.length; i++ ) {
+ try {
+ folders[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch( CoreException ce ) {}
+ }
}
-
- public void startedBuild(IPath project) {
- // TODO Auto-generated method stub
-
- }
-
- public void startedBuildingArchive(IArchive pkg) {
- // TODO Auto-generated method stub
-
- }
-
- public void startedCollectingFileSet(IArchiveFileSet fileset) {
- // TODO Auto-generated method stub
-
- }
-
}
Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2011-03-28 23:27:51 UTC (rev 30074)
+++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2011-03-28 23:34:25 UTC (rev 30075)
@@ -142,8 +142,14 @@
EventManager.cleanArchiveBuild(pkg);
EventManager.startedBuildingArchive(pkg);
-
- ModelTruezipBridge.deleteArchive(pkg);
+
+ IPath filePath = pkg.getArchiveFilePath();
+ if( filePath.toFile().isFile())
+ filePath.toFile().delete();
+ else
+ TrueZipUtil.javaIODeleteDir(filePath.toFile());
+
+ //ModelTruezipBridge.deleteArchive(pkg);
IPath dest = PathUtils.getGlobalLocation(pkg);
if( dest != null && !dest.toFile().exists() ) {
if( !dest.toFile().mkdirs() ) {
Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
===================================================================
--- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2011-03-28 23:27:51 UTC (rev 30074)
+++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2011-03-28 23:34:25 UTC (rev 30075)
@@ -13,12 +13,18 @@
import java.util.ArrayList;
import java.util.Arrays;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.ArchivesCoreMessages;
+import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
import org.jboss.ide.eclipse.archives.core.model.EventManager;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
@@ -27,7 +33,6 @@
import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeDelta;
-import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
import org.jboss.ide.eclipse.archives.core.util.internal.ModelTruezipBridge;
import org.jboss.ide.eclipse.archives.core.util.internal.ModelTruezipBridge.FileWrapperStatusPair;
@@ -50,9 +55,18 @@
* This is the entry point for model change events.
* It immediately passes the delta to be handled.
*/
- public void modelChanged(IArchiveNodeDelta delta) {
- if( shouldRun(delta))
- executeAndLog(delta);
+ public void modelChanged(final IArchiveNodeDelta delta) {
+ if( shouldRun(delta)) {
+ Job j = new WorkspaceJob("Responding to archives model change") { //$NON-NLS-1$
+ public IStatus runInWorkspace(IProgressMonitor monitor)
+ throws CoreException {
+ executeAndLog(delta);
+ return Status.OK_STATUS;
+ }
+ };
+ j.setRule(ResourcesPlugin.getWorkspace().getRoot());
+ j.schedule();
+ }
}
protected boolean shouldRun(IArchiveNodeDelta delta) {
Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
--- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2011-03-28 23:27:51 UTC (rev 30074)
+++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2011-03-28 23:34:25 UTC (rev 30075)
@@ -243,7 +243,7 @@
} else {
parentFile = fsFile;
}
- returnFiles.add(new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.DEFAULT));
+ returnFiles.add(new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.NULL));
}
return (File[]) returnFiles.toArray(new File[returnFiles.size()]);
}
Modified: branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java
===================================================================
--- branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2011-03-28 23:27:51 UTC (rev 30074)
+++ branches/jbosstools-3.2.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2011-03-28 23:34:25 UTC (rev 30075)
@@ -167,4 +167,22 @@
}
}
+
+
+ public static boolean javaIODeleteDir(java.io.File dir) {
+ if (dir.isDirectory()) {
+ String[] children = dir.list();
+ for (int i=0; i<children.length; i++) {
+ boolean success = javaIODeleteDir(new java.io.File(dir, children[i]));
+ if (!success) {
+ return false;
+ }
+ }
+ }
+
+ // The directory is now empty so delete it
+ return dir.delete();
+ }
+
+
}
13 years, 1 month
JBoss Tools SVN: r30074 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src: main/org/jboss/ide/eclipse/archives/core/build and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-03-28 19:27:51 -0400 (Mon, 28 Mar 2011)
New Revision: 30074
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/PostBuildRefresher.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java
Log:
JBIDE-7111 deadlock in project archives
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java 2011-03-28 22:22:02 UTC (rev 30073)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java 2011-03-28 23:27:51 UTC (rev 30074)
@@ -15,6 +15,7 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -46,12 +47,14 @@
protected void executeAndLog(IArchiveNodeDelta delta) {
final IArchiveNodeDelta delta2 = delta;
- new Job(ArchivesCoreMessages.UpdatingModelJob) {
- public IStatus run(IProgressMonitor monitor) {
+ Job j = new WorkspaceJob(ArchivesCoreMessages.UpdatingModelJob) {
+ public IStatus runInWorkspace(IProgressMonitor monitor) {
ModelChangeListenerWithRefresh.super.executeAndLog(delta2);
return Status.OK_STATUS;
}
- }.schedule();
+ };
+ j.setRule(ResourcesPlugin.getWorkspace().getRoot());
+ j.schedule();
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/PostBuildRefresher.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/PostBuildRefresher.java 2011-03-28 22:22:02 UTC (rev 30073)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/PostBuildRefresher.java 2011-03-28 23:27:51 UTC (rev 30074)
@@ -4,93 +4,45 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.jboss.ide.eclipse.archives.core.model.AbstractBuildListener;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveBuildListener;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.util.PathUtils;
-public class PostBuildRefresher implements IArchiveBuildListener {
+public class PostBuildRefresher extends AbstractBuildListener {
- public void buildFailed(IArchive pkg, IStatus status) {
+ public void finishedBuildingArchive(final IArchive pkg) {
// TODO Auto-generated method stub
-
- }
-
- public void cleanArchive(IArchive pkg) {
- // TODO Auto-generated method stub
-
- }
-
- public void cleanProject(IPath project) {
- // TODO Auto-generated method stub
-
- }
-
- public void error(IArchiveNode node, IStatus[] multi) {
- // TODO Auto-generated method stub
-
- }
-
- public void fileRemoved(IArchive topLevelArchive, IArchiveFileSet fileset,
- IPath filePath) {
- // TODO Auto-generated method stub
-
- }
-
- public void fileUpdated(IArchive topLevelArchive, IArchiveFileSet fileset,
- IPath filePath) {
- // TODO Auto-generated method stub
-
- }
-
- public void finishedBuild(IPath project) {
-
- // TODO Auto-generated method stub
-
- }
-
- public void finishedBuildingArchive(IArchive pkg) {
- // TODO Auto-generated method stub
if( pkg.isDestinationInWorkspace()) {
- IPath loc = PathUtils.getGlobalLocation(pkg);
- IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(loc);
- for( int i = 0; i < files.length; i++ ) {
- try {
- files[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- } catch( CoreException ce ) {}
- }
- IContainer[] folders = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocation(loc);
- for( int i = 0; i < folders.length; i++ ) {
- try {
- folders[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- } catch( CoreException ce ) {}
- }
+ new WorkspaceJob("Refresh Project") { //$NON-NLS-1$
+ public IStatus runInWorkspace(IProgressMonitor monitor)
+ throws CoreException {
+ handlePostBuild(pkg);
+ return Status.OK_STATUS;
+ }
+ }.schedule(1000);
}
}
-
- public void finishedCollectingFileSet(IArchiveFileSet fileset) {
- // TODO Auto-generated method stub
-
+
+ private void handlePostBuild(IArchive pkg) {
+ IPath loc = PathUtils.getGlobalLocation(pkg);
+ IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(loc);
+ for( int i = 0; i < files.length; i++ ) {
+ try {
+ files[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch( CoreException ce ) {}
+ }
+ IContainer[] folders = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocation(loc);
+ for( int i = 0; i < folders.length; i++ ) {
+ try {
+ folders[i].refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ } catch( CoreException ce ) {}
+ }
}
-
- public void startedBuild(IPath project) {
- // TODO Auto-generated method stub
-
- }
-
- public void startedBuildingArchive(IArchive pkg) {
- // TODO Auto-generated method stub
-
- }
-
- public void startedCollectingFileSet(IArchiveFileSet fileset) {
- // TODO Auto-generated method stub
-
- }
-
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2011-03-28 22:22:02 UTC (rev 30073)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2011-03-28 23:27:51 UTC (rev 30074)
@@ -142,8 +142,14 @@
EventManager.cleanArchiveBuild(pkg);
EventManager.startedBuildingArchive(pkg);
-
- ModelTruezipBridge.deleteArchive(pkg);
+
+ IPath filePath = pkg.getArchiveFilePath();
+ if( filePath.toFile().isFile())
+ filePath.toFile().delete();
+ else
+ TrueZipUtil.javaIODeleteDir(filePath.toFile());
+
+ //ModelTruezipBridge.deleteArchive(pkg);
IPath dest = PathUtils.getGlobalLocation(pkg);
if( dest != null && !dest.toFile().exists() ) {
if( !dest.toFile().mkdirs() ) {
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2011-03-28 22:22:02 UTC (rev 30073)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2011-03-28 23:27:51 UTC (rev 30074)
@@ -13,12 +13,18 @@
import java.util.ArrayList;
import java.util.Arrays;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.ArchivesCoreMessages;
+import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
import org.jboss.ide.eclipse.archives.core.model.EventManager;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
@@ -27,7 +33,6 @@
import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeDelta;
-import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
import org.jboss.ide.eclipse.archives.core.util.internal.ModelTruezipBridge;
import org.jboss.ide.eclipse.archives.core.util.internal.ModelTruezipBridge.FileWrapperStatusPair;
@@ -50,9 +55,18 @@
* This is the entry point for model change events.
* It immediately passes the delta to be handled.
*/
- public void modelChanged(IArchiveNodeDelta delta) {
- if( shouldRun(delta))
- executeAndLog(delta);
+ public void modelChanged(final IArchiveNodeDelta delta) {
+ if( shouldRun(delta)) {
+ Job j = new WorkspaceJob("Responding to archives model change") { //$NON-NLS-1$
+ public IStatus runInWorkspace(IProgressMonitor monitor)
+ throws CoreException {
+ executeAndLog(delta);
+ return Status.OK_STATUS;
+ }
+ };
+ j.setRule(ResourcesPlugin.getWorkspace().getRoot());
+ j.schedule();
+ }
}
protected boolean shouldRun(IArchiveNodeDelta delta) {
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2011-03-28 22:22:02 UTC (rev 30073)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2011-03-28 23:27:51 UTC (rev 30074)
@@ -243,7 +243,7 @@
} else {
parentFile = fsFile;
}
- returnFiles.add(new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.DEFAULT));
+ returnFiles.add(new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.NULL));
}
return (File[]) returnFiles.toArray(new File[returnFiles.size()]);
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2011-03-28 22:22:02 UTC (rev 30073)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2011-03-28 23:27:51 UTC (rev 30074)
@@ -167,4 +167,22 @@
}
}
+
+
+ public static boolean javaIODeleteDir(java.io.File dir) {
+ if (dir.isDirectory()) {
+ String[] children = dir.list();
+ for (int i=0; i<children.length; i++) {
+ boolean success = javaIODeleteDir(new java.io.File(dir, children[i]));
+ if (!success) {
+ return false;
+ }
+ }
+ }
+
+ // The directory is now empty so delete it
+ return dir.delete();
+ }
+
+
}
13 years, 1 month