[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module ...
Robert Stryker
rob.stryker at jboss.com
Mon Mar 19 18:49:35 EDT 2007
User: rawb
Date: 07/03/19 18:49:35
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module
PackagedArtifactAdapter.java
PackageModuleFactory.java
Log:
Integration with packages
Removal of path publisher for individual files
Changes to event log label providers
Revision Changes Path
1.4 +1 -20 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/PackagedArtifactAdapter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackagedArtifactAdapter.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/PackagedArtifactAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PackagedArtifactAdapter.java 23 Feb 2007 21:57:32 -0000 1.3
+++ PackagedArtifactAdapter.java 19 Mar 2007 22:49:35 -0000 1.4
@@ -17,7 +17,6 @@
public PackagedArtifactAdapter() {
}
- private PackageModuleFactory factory;
public IModuleArtifact getModuleArtifact(Object obj) {
if( obj instanceof IJavaProject ) {
IProject[] projects2 = ResourcesPlugin.getWorkspace().getRoot().getProjects();
@@ -33,7 +32,7 @@
}
if( obj instanceof IProject ) {
- PackageModuleFactory factory = getFactory();
+ PackageModuleFactory factory = PackageModuleFactory.getFactory();
if( factory != null ) {
IModule[] mods = factory.getModulesFromProject((IProject)obj);
if( mods != null && mods.length != 0) {
@@ -44,24 +43,6 @@
return null;
}
- protected PackageModuleFactory getFactory() {
- if( factory != null ) return factory;
-
- ModuleFactory[] factories = ServerPlugin.getModuleFactories();
- System.out.println(PackageModuleFactory.FACTORY_TYPE_ID);
- for( int i = 0; i < factories.length; i++ ) {
- System.out.println(" " + factories[i].getId());
- if( factories[i].getId().equals(PackageModuleFactory.FACTORY_TYPE_ID)) {
- Object o = factories[i].getDelegate(new NullProgressMonitor());
- if( o instanceof PackageModuleFactory ) {
- factory = (PackageModuleFactory)o;
- return factory;
- }
- }
- }
- return null;
- }
-
protected IModuleArtifact getArtifact(IModule[] mod) {
//return new PackagedArtifact(mod);
// TODO Blocking on eclipse bug 174372
1.4 +49 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/PackageModuleFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageModuleFactory.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/PackageModuleFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PackageModuleFactory.java 2 Mar 2007 21:59:28 -0000 1.3
+++ PackageModuleFactory.java 19 Mar 2007 22:49:35 -0000 1.4
@@ -22,6 +22,8 @@
package org.jboss.ide.eclipse.as.core.module;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -33,6 +35,9 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.internal.ModuleFactory;
+import org.eclipse.wst.server.core.internal.ModuleFile;
+import org.eclipse.wst.server.core.internal.ServerPlugin;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.ModuleDelegate;
import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
@@ -53,6 +58,27 @@
public static final String MODULE_TYPE = "jboss.package";
public static final String VERSION = "1.0";
+ private static PackageModuleFactory factory;
+ public static PackageModuleFactory getFactory() {
+ if( factory != null ) return factory;
+
+ ModuleFactory[] factories = ServerPlugin.getModuleFactories();
+ System.out.println(PackageModuleFactory.FACTORY_TYPE_ID);
+ for( int i = 0; i < factories.length; i++ ) {
+ System.out.println(" " + factories[i].getId());
+ if( factories[i].getId().equals(PackageModuleFactory.FACTORY_TYPE_ID)) {
+ Object o = factories[i].getDelegate(new NullProgressMonitor());
+ if( o instanceof PackageModuleFactory ) {
+ factory = (PackageModuleFactory)o;
+ return factory;
+ }
+ }
+ }
+ return null;
+ }
+
+
+
public PackageModuleFactory() {
super();
}
@@ -122,8 +148,10 @@
public class PackagedModuleDelegate extends ModuleDelegate {
private IPackage pack;
+ private HashMap members;
public PackagedModuleDelegate(IPackage pack) {
this.pack = pack;
+ members = new HashMap();
}
public IPackage getPackage() {return pack;}
public IModule[] getChildModules() {
@@ -131,9 +159,29 @@
}
public IModuleResource[] members() throws CoreException {
- return new IModuleResource[0];
+ Collection c = members.values();
+ return (IModuleResource[]) c.toArray(new IModuleResource[c.size()]);
}
+ public void fileUpdated(IPath filePath) {
+ long timestamp;
+ timestamp = new Date().getTime(); // now
+
+ IPath dest = pack.getDestinationPath();
+ if( dest.isPrefixOf(filePath)) {
+ filePath = filePath.removeFirstSegments(dest.segmentCount());
+ }
+ members.put(filePath, new ModuleFile(filePath.lastSegment(), filePath, timestamp));
+ }
+ public void fileRemoved(IPath filePath) {
+ IPath dest = pack.getDestinationPath();
+ if( dest.isPrefixOf(filePath)) {
+ filePath = filePath.removeFirstSegments(dest.segmentCount());
+ }
+ members.remove(filePath);
+ }
+
+
public IStatus validate() {
return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,
0, "", null);
More information about the jboss-cvs-commits
mailing list