Author: rob.stryker(a)jboss.com Date: 2008-05-19 16:00:12 -0400 (Mon, 19 May 2008) New Revision: 8200 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublisherEventLogger.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java Log: JBIDE-2211 on trunk stream Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-05-19 19:21:57 UTC (rev 8199) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-05-19 20:00:12 UTC (rev 8200) @@ -118,7 +118,7 @@ protected IStatus fullPublish(IModule[] moduleTree, IModule module, IProgressMonitor monitor) throws CoreException { - eventRoot.setProperty(PublisherEventLogger.CHANGED_FILE_COUNT, countMembers(module)); + eventRoot.setProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT, countMembers(module)); IPath deployPath = getDeployPath(moduleTree); ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, monitor); IModuleResource[] members = md.members(); @@ -151,7 +151,7 @@ } protected IStatus incrementalPublish(IModule[] moduleTree, IModule module, IProgressMonitor monitor) throws CoreException { - eventRoot.setProperty(PublisherEventLogger.CHANGED_FILE_COUNT, countChanges(delta)); + eventRoot.setProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT, countChanges(delta)); IStatus[] results = new IStatus[] {}; if( !deployPackaged(moduleTree)) results = new PublishUtil(server.getServer()).publishDelta(delta, getDeployPath(moduleTree), monitor); @@ -168,7 +168,7 @@ protected IStatus unpublish(IDeployableServer jbServer, IModule[] module, IProgressMonitor monitor) throws CoreException { - eventRoot.setProperty(PublisherEventLogger.CHANGED_FILE_COUNT, countMembers(module[module.length-1])); + eventRoot.setProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT, countMembers(module[module.length-1])); boolean error = localSafeDelete(getDeployPath(module), eventRoot); if( error ) { publishState = IServer.PUBLISH_STATE_FULL; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java 2008-05-19 19:21:57 UTC (rev 8199) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java 2008-05-19 20:00:12 UTC (rev 8200) @@ -118,12 +118,11 @@ } PublisherFileUtilListener listener = new PublisherFileUtilListener(eventRoot); + eventRoot.setProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT, countChanges(delta)); if( incremental ) { - eventRoot.setProperty(PublisherEventLogger.CHANGED_FILE_COUNT, countChanges(delta)); publishFromDelta(module, destPathRoot, sourcePath.removeLastSegments(1), delta, listener); } else { // full publish, copy whole folder or file - eventRoot.setProperty(PublisherEventLogger.CHANGED_FILE_COUNT, countConcreteFiles(module)); FileUtil.fileSafeCopy(sourcePath.toFile(), destPathRoot.append(sourcePath.lastSegment()).toFile(), listener); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublisherEventLogger.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublisherEventLogger.java 2008-05-19 19:21:57 UTC (rev 8199) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublisherEventLogger.java 2008-05-19 20:00:12 UTC (rev 8200) @@ -81,7 +81,7 @@ public static final String DEST_PROPERTY = "org.jboss.ide.eclipse.as.core.publishers.Events.Properties.DEST_PROPERTY"; public static final String EXCEPTION_MESSAGE = "org.jboss.ide.eclipse.as.core.publishers.Events.Properties.EXCEPTION_PROPERTY"; public static final String CHANGED_MODULE_COUNT = "org.jboss.ide.eclipse.as.core.publishers.Events.Properties.CHANGED_MODULE_COUNT_PROPERTY"; - public static final String CHANGED_FILE_COUNT = "org.jboss.ide.eclipse.as.core.publishers.Events.Properties.CHANGED_FILE_COUNT_PROPERTY"; + public static final String CHANGED_RESOURCE_COUNT = "org.jboss.ide.eclipse.as.core.publishers.Events.Properties.CHANGED_RESOURCE_COUNT_PROPERTY"; public static class DeletedEvent extends EventLogTreeItem { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2008-05-19 19:21:57 UTC (rev 8199) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2008-05-19 20:00:12 UTC (rev 8200) @@ -53,7 +53,7 @@ } else if( publishType == INCREMENTAL_PUBLISH ) { status = publish(server, module2, false, monitor); } - root.setProperty(PublisherEventLogger.CHANGED_FILE_COUNT, new Integer(1)); + root.setProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT, new Integer(1)); return status; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2008-05-19 19:21:57 UTC (rev 8199) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2008-05-19 20:00:12 UTC (rev 8200) @@ -137,11 +137,11 @@ } // add file changed count to top level element - i = (Integer)publishRootEvent.getProperty(PublisherEventLogger.CHANGED_FILE_COUNT); - j = (Integer)modulePublishEvent.getProperty(PublisherEventLogger.CHANGED_FILE_COUNT); + i = (Integer)publishRootEvent.getProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT); + j = (Integer)modulePublishEvent.getProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT); j = j == null ? new Integer(0) : j; int count = (i == null ? 0 : i.intValue()) + j.intValue(); - publishRootEvent.setProperty(PublisherEventLogger.CHANGED_FILE_COUNT, count); + publishRootEvent.setProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT, count); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java 2008-05-19 19:21:57 UTC (rev 8199) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/PackagesPublishLabelProvider.java 2008-05-19 20:00:12 UTC (rev 8200) @@ -75,7 +75,7 @@ propertyToMessageMap.put(PublisherEventLogger.DELTA_KIND + DELIMITER + ServerBehaviourDelegate.REMOVED, "Removed"); propertyToMessageMap.put(PublisherEventLogger.DELTA_KIND + DELIMITER + ServerBehaviourDelegate.NO_CHANGE, "No Change"); - propertyToMessageMap.put(PublisherEventLogger.CHANGED_FILE_COUNT, "Changed File(s)"); + propertyToMessageMap.put(PublisherEventLogger.CHANGED_RESOURCE_COUNT, "Changed File(s)"); propertyToMessageMap.put(PublisherEventLogger.CHANGED_MODULE_COUNT, "Changed Module(s)"); // propertyToMessageMap.put(IJBossServerPublisher.MODULE_NAME, "Module Name"); @@ -159,11 +159,11 @@ if( type.equals(PublisherEventLogger.ROOT_EVENT)) { Integer tmp; int files, mods; - tmp = (Integer)item.getProperty(PublisherEventLogger.CHANGED_FILE_COUNT); + tmp = (Integer)item.getProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT); files = tmp == null ? 0 : tmp.intValue(); tmp = (Integer)item.getProperty(PublisherEventLogger.CHANGED_MODULE_COUNT); mods = tmp == null ? 0 : tmp.intValue(); - return "Publishing [" + mods + " modules, " + files + " files changed]"; + return "Publishing [" + mods + " modules, " + files + " resources changed]"; } if( type.equals(PublisherEventLogger.MODULE_ROOT_EVENT)) {