[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model ...
Robert Stryker
rob.stryker at jboss.com
Mon Mar 19 18:49:34 EDT 2007
User: rawb
Date: 07/03/19 18:49:34
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model
PackagesListener.java EventLogModel.java
Log:
Integration with packages
Removal of path publisher for individual files
Changes to event log label providers
Revision Changes Path
1.4 +15 -41 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/PackagesListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackagesListener.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/PackagesListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- PackagesListener.java 8 Mar 2007 22:32:27 -0000 1.3
+++ PackagesListener.java 19 Mar 2007 22:49:34 -0000 1.4
@@ -34,6 +34,7 @@
import org.eclipse.wst.server.core.internal.ServerPlugin;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.module.PackageModuleFactory;
+import org.jboss.ide.eclipse.as.core.module.PackageModuleFactory.PackagedModuleDelegate;
import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.stripped.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
@@ -46,7 +47,6 @@
/**
*
* @author rob.stryker at jboss.com
- * This class is teh suck. I dont even know whether to keep it
*/
public class PackagesListener extends AbstractPackagesBuildListener {
@@ -61,43 +61,25 @@
return instance;
}
- //Keeping track of build changes
- private HashMap changesOrAdditions = new HashMap();
- private HashMap removals = new HashMap();
-
-
public PackagesListener() {
PackagesCore.addPackagesBuildListener(this);
}
public void startedBuildingPackage(IPackage pkg) {
-// if( pkg.isTopLevel() ) {
-// changesOrAdditions.put(pkg, new ArrayList());
-// removals.put(pkg, new ArrayList());
-// }
+ System.out.println("starting pkg: " + pkg.getName());
}
public void fileRemoved(IPackage topLevelPackage, IPackageFileSet fileset, IPath filePath) {
// make absolute
IPath filePath2 = makeAbsolute(filePath, topLevelPackage); // change
- ArrayList removes = (ArrayList)removals.get(topLevelPackage);
- if (removes == null) {
- removes = new ArrayList();
- changesOrAdditions.put(topLevelPackage, removes);
- }
-
- if( !removes.contains(filePath2)) removes.add(filePath2);
+ PackagedModuleDelegate del = getModuleDelegate(topLevelPackage);
+ del.fileRemoved(filePath2);
}
public void fileUpdated(IPackage topLevelPackage, IPackageFileSet fileset, IPath filePath) {
// make absolute
IPath filePath2 = makeAbsolute(filePath, topLevelPackage); // change
- ArrayList changes = (ArrayList)changesOrAdditions.get(topLevelPackage);
- if (changes == null) {
- changes = new ArrayList();
- changesOrAdditions.put(topLevelPackage, changes);
- }
-
- if( !changes.contains(filePath2)) changes.add(filePath2);
+ PackagedModuleDelegate del = getModuleDelegate(topLevelPackage);
+ del.fileUpdated(filePath2);
}
public IPath makeAbsolute(IPath local, IPackage topLevelPackage) {
@@ -105,12 +87,11 @@
return ResourceUtil.makeAbsolute(file, topLevelPackage.isDestinationInWorkspace());
}
public void finishedBuildingPackage(IPackage pkg) {
+ System.out.println("finishedBuildingPackage started: " + pkg.getName());
if( pkg.isTopLevel() && new Boolean(pkg.getProperty(DEPLOY_AFTER_BUILD)).booleanValue()) {
publish(pkg);
- // then clean up what's been changed
- changesOrAdditions.remove(pkg);
- removals.remove(pkg);
}
+ System.out.println("done publishing from finishedBuildingPackage: " + pkg.getName());
}
@@ -132,7 +113,12 @@
}
protected static IModule[] getModule(IPackage node) {
ModuleFactory factory = ServerPlugin.findModuleFactory("org.jboss.ide.eclipse.as.core.PackageModuleFactory");
- return new IModule[] { factory.getModule(PackageModuleFactory.getID(node)) };
+ IModule mod = factory.getModule(PackageModuleFactory.getID(node));
+ return new IModule[] { mod };
+ }
+ protected static PackagedModuleDelegate getModuleDelegate(IPackage node) {
+ IModule mod = getModule(node)[0];
+ return (PackagedModuleDelegate)mod.loadAdapter(PackagedModuleDelegate.class, new NullProgressMonitor());
}
protected IDeployableServer getDeployableServerFromBehavior(DeployableServerBehavior dsb) {
@@ -158,18 +144,6 @@
return (DeployableServerBehavior[]) list.toArray(new DeployableServerBehavior[list.size()]);
}
-
-
- // should be called from the publisher to figure out what's changed
- public IPath[] getUpdatedFiles(IPackage pkg) {
- ArrayList list = (ArrayList)changesOrAdditions.get(pkg);
- return list == null ? new IPath[0] : (IPath[]) list.toArray(new IPath[list.size()]);
- }
- public IPath[] getRemovedFiles(IPackage pkg) {
- ArrayList list = (ArrayList)removals.get(pkg);
- return list == null ? new IPath[0] : (IPath[]) list.toArray(new IPath[list.size()]);
- }
-
/*
* If a node is changing from exploded to imploded, or vice versa
* make sure to delete the pre-existing file or folder on the server.
@@ -184,7 +158,7 @@
sourcePath = topLevelPackage.getPackageFilePath();
depServer = getDeployableServerFromBehavior(serverBehaviors[i]);
destPath = new Path(depServer.getDeployDirectory()).append(sourcePath.lastSegment());
- boolean success = FileUtil.safeDelete(destPath.toFile());
+ FileUtil.safeDelete(destPath.toFile());
FileUtil.fileSafeCopy(sourcePath.toFile(), destPath.toFile());
}
}
1.5 +2 -5 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/EventLogModel.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EventLogModel.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/EventLogModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- EventLogModel.java 22 Dec 2006 23:24:42 -0000 1.4
+++ EventLogModel.java 19 Mar 2007 22:49:34 -0000 1.5
@@ -22,6 +22,7 @@
package org.jboss.ide.eclipse.as.core.model;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import org.eclipse.wst.server.core.IServer;
@@ -114,11 +115,7 @@
super(parent, null);
this.specificType = specificType;
this.majorType = majorType;
- }
- public EventLogTreeItem(SimpleTreeItem parent, Object data, String majorType, String specificType) {
- super(parent, data);
- this.specificType = specificType;
- this.majorType = majorType;
+ setProperty(DATE, new Long(new Date().getTime()));
}
public String getEventClass() {
return majorType;
More information about the jboss-cvs-commits
mailing list