[jbosstools-commits] JBoss Tools SVN: r2059 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src: eclipse/org/jboss/ide/eclipse/archives/core/build and 3 other directories.

Author: rob.stryker(a)jboss.com Date: 2007-05-22 11:47:32 -0400 (Tue, 22 May 2007) New Revision: 2059 Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java Removed: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/StandaloneArchivesCore.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveType.java Log: RefreshLocal preserved in a subclass ModelChangeListenerWithRefresh. Core constructors add appropriate listener. Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2007-05-22 15:01:59 UTC (rev 2058) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceArchivesCore.java 2007-05-22 15:47:32 UTC (rev 2059) @@ -4,6 +4,8 @@ import org.eclipse.core.runtime.IPath; import org.jboss.ide.eclipse.archives.core.ArchivesCore; +import org.jboss.ide.eclipse.archives.core.build.ModelChangeListenerWithRefresh; +import org.jboss.ide.eclipse.archives.core.model.ArchivesModel; import org.jboss.ide.eclipse.archives.core.model.other.IExtensionManager; import org.jboss.ide.eclipse.archives.core.model.other.IPreferenceManager; import org.jboss.ide.eclipse.archives.core.model.other.IRuntimeVariables; @@ -17,6 +19,7 @@ public WorkspaceArchivesCore () { super(WORKSPACE); + ArchivesModel.instance().addModelListener(new ModelChangeListenerWithRefresh()); } protected IExtensionManager createExtensionManager() { Deleted: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2007-05-22 15:01:59 UTC (rev 2058) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2007-05-22 15:47:32 UTC (rev 2059) @@ -1,187 +0,0 @@ -package org.jboss.ide.eclipse.archives.core.build; - - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.jboss.ide.eclipse.archives.core.ArchivesCore; -import org.jboss.ide.eclipse.archives.core.model.IArchive; -import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet; -import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder; -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.events.EventManager; -import org.jboss.ide.eclipse.archives.core.model.other.IArchiveModelListener; -import org.jboss.ide.eclipse.archives.core.util.ModelUtil; -import org.jboss.ide.eclipse.archives.core.util.internal.ModelTruezipBridge; - -/** - * This class responds to model change events. - * It is given a delta as to what nodes are added, removed, or changed. - * It then keeps the output file for the top level archive in sync with - * the changes to the model. - * - * If the automatic builder is not enabled for this project, the listener - * does nothing. - * - * @author Rob Stryker (rob.stryker(a)redhat.com) - * - */ -public class ModelChangeListener implements IArchiveModelListener { - - /** - * This is the entry point for model change events. - * It immediately passes the delta to be handled. - */ - public void modelChanged(IArchiveNodeDelta delta) { - // if we're not building, get out - if( !ArchivesCore.getInstance().getPreferenceManager().isBuilderEnabled(delta.getPostNode().getProjectPath())) - return; - - try { - handle(delta); - } catch( Exception e ) { - e.printStackTrace(); - } - } - - /** - * This can handle any type of node / delta, not just - * root elements. If the node is added or removed, it - * will handle those segments and return without checking - * the children at all. IT is the responsibility of the add - * and remove methods to go through the children. - * - * Otherwise, it will simply handle attribute children and then - * move on to the children. - * - * @param delta - */ - private void handle(IArchiveNodeDelta delta) { - if( (delta.getKind() & IArchiveNodeDelta.REMOVED) != 0 ) { - nodeRemoved(delta.getPreNode()); - return; - } else if( (delta.getKind() & IArchiveNodeDelta.ADDED) != 0 ) { - nodeAdded(delta.getPostNode()); - return; - } else if( (delta.getKind() & IArchiveNodeDelta.ATTRIBUTE_CHANGED) != 0) { - boolean shouldHandleChildren = handleAttributeChange(delta); - if( shouldHandleChildren ) { - IArchiveNodeDelta[] children = delta.getAllAffectedChildren(); - for( int i = 0; i < children.length; i++ ) { - handle(children[i]); - } - } - } else if( descendentChanged(delta.getKind()) ) { - IArchiveNodeDelta[] children = delta.getAllAffectedChildren(); - for( int i = 0; i < children.length; i++ ) { - handle(children[i]); - } - } - } - protected boolean descendentChanged(int kind) { - return (kind & IArchiveNodeDelta.DESCENDENT_CHANGED) != 0 || - (kind & IArchiveNodeDelta.CHILD_ADDED) != 0 || - (kind & IArchiveNodeDelta.CHILD_REMOVED) != 0; - } - - /** - * Handle changes in this node - * @param delta - * @return Whether or not the caller should also handle the children - */ - private boolean handleAttributeChange(IArchiveNodeDelta delta) { - switch( delta.getPostNode().getNodeType()) { - case IArchiveNode.TYPE_ARCHIVE_FOLDER: - return handleFolderAttributeChanged(delta); - case IArchiveNode.TYPE_ARCHIVE_FILESET: - return handleFilesetAttributeChanged(delta); - case IArchiveNode.TYPE_ARCHIVE: - return handlePackageAttributeChanged(delta); - } - return false; - } - - private boolean handleFolderAttributeChanged(IArchiveNodeDelta delta) { - nodeRemoved(delta.getPreNode()); - nodeAdded(delta.getPostNode()); - return false; - } - - private boolean handleFilesetAttributeChanged(IArchiveNodeDelta delta) { - nodeRemoved(delta.getPreNode()); - nodeAdded(delta.getPostNode()); - return false; - } - - private boolean handlePackageAttributeChanged(IArchiveNodeDelta delta) { - nodeRemoved(delta.getPreNode()); - nodeAdded(delta.getPostNode()); - return false; - } - - - - - private void nodeAdded(IArchiveNode added) { - if( added.getNodeType() == IArchiveNode.TYPE_ARCHIVE) { - // create the package - ModelTruezipBridge.createFile(added); - } else if( added.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FOLDER ) { - // create hte folder - ModelTruezipBridge.createFile(added); - } - IArchiveFileSet[] filesets = ModelUtil.findAllDescendentFilesets(added); - for( int i = 0; i < filesets.length; i++ ) { - ModelTruezipBridge.fullFilesetBuild(filesets[i]); - IPath[] paths = filesets[i].findMatchingPaths(); - EventManager.filesUpdated(filesets[i].getRootArchive(), filesets[i], paths); - } - refreshLocal(added); - } - - - private void nodeRemoved(IArchiveNode removed) { - if( removed.getNodeType() == IArchiveNode.TYPE_ARCHIVE) { - ModelTruezipBridge.deleteArchive((IArchive)removed); - refreshLocal(removed); - return; - } else if( removed.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FOLDER ){ - IArchiveFileSet[] filesets = ModelUtil.findAllDescendentFilesets(((IArchiveFolder)removed)); - for( int i = 0; i < filesets.length; i++ ) { - IPath[] removedPaths = ModelTruezipBridge.fullFilesetRemove(((IArchiveFileSet)removed), false); - EventManager.filesRemoved(removedPaths, ((IArchiveFileSet)removed)); - } - refreshLocal(removed); - return; - } - - IArchiveFileSet[] filesets = ModelUtil.findAllDescendentFilesets(removed); - for( int i = 0; i < filesets.length; i++ ) { - IPath[] removedPaths = ModelTruezipBridge.fullFilesetRemove(((IArchiveFileSet)removed), false); - EventManager.filesRemoved(removedPaths, ((IArchiveFileSet)removed)); - } - refreshLocal(removed); - } - - - // refresh the file tree structure - private void refreshLocal(IArchiveNode node) { - IArchive pack = node.getRootArchive(); - if( pack != null && pack.isDestinationInWorkspace() ) { - // refresh the root package node - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - IResource res = root.getContainerForLocation(pack.getDestinationPath()); - if( res != null ) { - try { - res.getParent().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - } catch( CoreException ce ) { - } - } - } - - } -} Copied: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java (from rev 2057, trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java) =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java (rev 0) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/ModelChangeListenerWithRefresh.java 2007-05-22 15:47:32 UTC (rev 2059) @@ -0,0 +1,40 @@ +package org.jboss.ide.eclipse.archives.core.build; + + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.ide.eclipse.archives.core.model.IArchive; +import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; + +/** + * This class responds to model change events. + * It is given a delta as to what nodes are added, removed, or changed. + * It then keeps the output file for the top level archive in sync with + * the changes to the model. + * + * If the automatic builder is not enabled for this project, the listener + * does nothing. + * + * @author Rob Stryker (rob.stryker(a)redhat.com) + * + */ +public class ModelChangeListenerWithRefresh extends ModelChangeListener { + + protected void postChange(IArchiveNode node) { + IArchive pack = node.getRootArchive(); + if( pack != null && pack.isDestinationInWorkspace() ) { + // refresh the root package node + IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); + IResource res = root.getContainerForLocation(pack.getDestinationPath()); + if( res != null ) { + try { + res.getParent().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + } catch( CoreException ce ) { + } + } + } + } +} Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/StandaloneArchivesCore.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/StandaloneArchivesCore.java 2007-05-22 15:01:59 UTC (rev 2058) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/StandaloneArchivesCore.java 2007-05-22 15:47:32 UTC (rev 2059) @@ -1,6 +1,8 @@ package org.jboss.ide.eclipse.archives.core; import org.eclipse.core.runtime.IPath; +import org.jboss.ide.eclipse.archives.core.build.ModelChangeListener; +import org.jboss.ide.eclipse.archives.core.model.ArchivesModel; import org.jboss.ide.eclipse.archives.core.model.other.IExtensionManager; import org.jboss.ide.eclipse.archives.core.model.other.IPreferenceManager; import org.jboss.ide.eclipse.archives.core.model.other.IRuntimeVariables; @@ -13,6 +15,7 @@ public StandaloneArchivesCore () { super(STANDALONE); + ArchivesModel.instance().addModelListener(new ModelChangeListener()); } protected IExtensionManager createExtensionManager() { Copied: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java (from rev 2057, trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/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 (rev 0) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2007-05-22 15:47:32 UTC (rev 2059) @@ -0,0 +1,180 @@ +package org.jboss.ide.eclipse.archives.core.build; + + +import org.eclipse.core.runtime.IPath; +import org.jboss.ide.eclipse.archives.core.ArchivesCore; +import org.jboss.ide.eclipse.archives.core.model.IArchive; +import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet; +import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder; +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.events.EventManager; +import org.jboss.ide.eclipse.archives.core.model.other.IArchiveModelListener; +import org.jboss.ide.eclipse.archives.core.util.ModelUtil; +import org.jboss.ide.eclipse.archives.core.util.internal.ModelTruezipBridge; + +/** + * This class responds to model change events. + * It is given a delta as to what nodes are added, removed, or changed. + * It then keeps the output file for the top level archive in sync with + * the changes to the model. + * + * If the automatic builder is not enabled for this project, the listener + * does nothing. + * + * @author Rob Stryker (rob.stryker(a)redhat.com) + * + */ +public class ModelChangeListener implements IArchiveModelListener { + + /** + * This is the entry point for model change events. + * It immediately passes the delta to be handled. + */ + public void modelChanged(IArchiveNodeDelta delta) { + // if we're not building, get out + if( !ArchivesCore.getInstance().getPreferenceManager().isBuilderEnabled(delta.getPostNode().getProjectPath())) + return; + + try { + handle(delta); + } catch( Exception e ) { + e.printStackTrace(); + } + } + + /** + * This can handle any type of node / delta, not just + * root elements. If the node is added or removed, it + * will handle those segments and return without checking + * the children at all. IT is the responsibility of the add + * and remove methods to go through the children. + * + * Otherwise, it will simply handle attribute children and then + * move on to the children. + * + * @param delta + */ + private void handle(IArchiveNodeDelta delta) { + if( (delta.getKind() & IArchiveNodeDelta.REMOVED) != 0 ) { + nodeRemoved(delta.getPreNode()); + return; + } else if( (delta.getKind() & IArchiveNodeDelta.ADDED) != 0 ) { + nodeAdded(delta.getPostNode()); + return; + } else if( (delta.getKind() & IArchiveNodeDelta.ATTRIBUTE_CHANGED) != 0) { + boolean shouldHandleChildren = handleAttributeChange(delta); + if( shouldHandleChildren ) { + IArchiveNodeDelta[] children = delta.getAllAffectedChildren(); + for( int i = 0; i < children.length; i++ ) { + handle(children[i]); + } + } + } else if( descendentChanged(delta.getKind()) ) { + IArchiveNodeDelta[] children = delta.getAllAffectedChildren(); + for( int i = 0; i < children.length; i++ ) { + handle(children[i]); + } + } + } + protected boolean descendentChanged(int kind) { + return (kind & IArchiveNodeDelta.DESCENDENT_CHANGED) != 0 || + (kind & IArchiveNodeDelta.CHILD_ADDED) != 0 || + (kind & IArchiveNodeDelta.CHILD_REMOVED) != 0; + } + + /** + * Handle changes in this node + * @param delta + * @return Whether or not the caller should also handle the children + */ + private boolean handleAttributeChange(IArchiveNodeDelta delta) { + switch( delta.getPostNode().getNodeType()) { + case IArchiveNode.TYPE_ARCHIVE_FOLDER: + return handleFolderAttributeChanged(delta); + case IArchiveNode.TYPE_ARCHIVE_FILESET: + return handleFilesetAttributeChanged(delta); + case IArchiveNode.TYPE_ARCHIVE: + return handlePackageAttributeChanged(delta); + } + return false; + } + + private boolean handleFolderAttributeChanged(IArchiveNodeDelta delta) { + nodeRemoved(delta.getPreNode()); + nodeAdded(delta.getPostNode()); + return false; + } + + private boolean handleFilesetAttributeChanged(IArchiveNodeDelta delta) { + nodeRemoved(delta.getPreNode()); + nodeAdded(delta.getPostNode()); + return false; + } + + private boolean handlePackageAttributeChanged(IArchiveNodeDelta delta) { + nodeRemoved(delta.getPreNode()); + nodeAdded(delta.getPostNode()); + return false; + } + + + + + private void nodeAdded(IArchiveNode added) { + if( added.getNodeType() == IArchiveNode.TYPE_ARCHIVE) { + // create the package + ModelTruezipBridge.createFile(added); + } else if( added.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FOLDER ) { + // create hte folder + ModelTruezipBridge.createFile(added); + } + IArchiveFileSet[] filesets = ModelUtil.findAllDescendentFilesets(added); + for( int i = 0; i < filesets.length; i++ ) { + ModelTruezipBridge.fullFilesetBuild(filesets[i]); + IPath[] paths = filesets[i].findMatchingPaths(); + EventManager.filesUpdated(filesets[i].getRootArchive(), filesets[i], paths); + } + postChange(added); + } + + + private void nodeRemoved(IArchiveNode removed) { + if( removed.getNodeType() == IArchiveNode.TYPE_ARCHIVE) { + ModelTruezipBridge.deleteArchive((IArchive)removed); + postChange(removed); + return; + } else if( removed.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FOLDER ){ + IArchiveFileSet[] filesets = ModelUtil.findAllDescendentFilesets(((IArchiveFolder)removed)); + for( int i = 0; i < filesets.length; i++ ) { + IPath[] removedPaths = ModelTruezipBridge.fullFilesetRemove(((IArchiveFileSet)removed), false); + EventManager.filesRemoved(removedPaths, ((IArchiveFileSet)removed)); + } + postChange(removed); + return; + } + + IArchiveFileSet[] filesets = ModelUtil.findAllDescendentFilesets(removed); + for( int i = 0; i < filesets.length; i++ ) { + IPath[] removedPaths = ModelTruezipBridge.fullFilesetRemove(((IArchiveFileSet)removed), false); + EventManager.filesRemoved(removedPaths, ((IArchiveFileSet)removed)); + } + postChange(removed); + } + + + protected void postChange(IArchiveNode node) { +// IArchive pack = node.getRootArchive(); +// if( pack != null && pack.isDestinationInWorkspace() ) { +// // refresh the root package node +// IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); +// IResource res = root.getContainerForLocation(pack.getDestinationPath()); +// if( res != null ) { +// try { +// res.getParent().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); +// } catch( CoreException ce ) { +// } +// } +// } + } +} Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2007-05-22 15:01:59 UTC (rev 2058) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2007-05-22 15:47:32 UTC (rev 2059) @@ -40,7 +40,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.jboss.ide.eclipse.archives.core.ArchivesCore; import org.jboss.ide.eclipse.archives.core.Trace; -import org.jboss.ide.eclipse.archives.core.build.ModelChangeListener; +import org.jboss.ide.eclipse.archives.core.build.ModelChangeListenerWithRefresh; import org.jboss.ide.eclipse.archives.core.model.events.EventManager; import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFileSetImpl; import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveFolderImpl; @@ -87,7 +87,6 @@ archivesRoot = new HashMap(); buildListeners = new ArrayList(); modelListeners = new ArrayList(); - addModelListener(new ModelChangeListener()); } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveType.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveType.java 2007-05-22 15:01:59 UTC (rev 2058) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveType.java 2007-05-22 15:47:32 UTC (rev 2059) @@ -21,7 +21,6 @@ */ package org.jboss.ide.eclipse.archives.core.model; -import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; /**