Author: rob.stryker(a)jboss.com Date: 2007-10-26 01:21:26 -0400 (Fri, 26 Oct 2007) New Revision: 4529 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java Log: JBIDE-1165 part deux Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java 2007-10-26 02:31:19 UTC (rev 4528) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java 2007-10-26 05:21:26 UTC (rev 4529) @@ -35,6 +35,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.jboss.ide.eclipse.archives.core.model.ArchivesModel; @@ -64,18 +65,23 @@ Iterator i = projects.iterator(); while(i.hasNext()) { final IProject p = (IProject)i.next(); - ArchivesModel.instance().registerProject(p.getLocation(), new NullProgressMonitor()); - new Job("Refresh Project: " + p.getName()) { - protected IStatus run(IProgressMonitor monitor) { - try { - p.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - } catch( CoreException e ) { - IStatus status = new Status(IStatus.WARNING, ArchivesCorePlugin.PLUGIN_ID, "Could not refresh project " + p.getName(), e); - return status; - } - return Status.OK_STATUS; + try { + if( p.getSessionProperty(new QualifiedName(ArchivesCorePlugin.PLUGIN_ID, "localname")) == null ) { + ArchivesModel.instance().registerProject(p.getLocation(), new NullProgressMonitor()); + new Job("Refresh Project: " + p.getName()) { + protected IStatus run(IProgressMonitor monitor) { + try { + p.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + } catch( CoreException e ) { + IStatus status = new Status(IStatus.WARNING, ArchivesCorePlugin.PLUGIN_ID, "Could not refresh project " + p.getName(), e); + return status; + } + return Status.OK_STATUS; + } + }.schedule(); } - }.schedule(); + } catch( CoreException ce ) { + } } } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2007-10-26 02:31:19 UTC (rev 4528) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2007-10-26 05:21:26 UTC (rev 4529) @@ -101,7 +101,7 @@ * @param fileset The fileset to match * @param topLevel The top level archive that the fileset belongs to */ - public void fullFilesetBuild(IArchiveFileSet fileset, IArchive topLevel) { + protected void fullFilesetBuild(IArchiveFileSet fileset, IArchive topLevel) { EventManager.startedCollectingFileSet(fileset); // reset the scanner. It *is* a full build afterall Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2007-10-26 02:31:19 UTC (rev 4528) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2007-10-26 05:21:26 UTC (rev 4529) @@ -169,7 +169,7 @@ // remove all top level items IArchiveNode[] kids = removed.getChildren(IArchiveNode.TYPE_ARCHIVE); for( int i = 0; i < kids.length; i++ ) { - ModelTruezipBridge.deleteArchive((IArchive)kids[i]); + nodeRemoved(kids[i]); } postChange(removed); return;