Author: adietish Date: 2011-06-07 16:53:44 -0400 (Tue, 07 Jun 2011) New Revision: 31886 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java Log: [JBIDE-9090] corrected methods signatures so that required parameters have consistent ordering Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-06-07 20:46:51 UTC (rev 31885) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-06-07 20:53:44 UTC (rev 31886) @@ -105,7 +105,7 @@ return p.toFile(); } - public static IStatus removeDeployFailedMarker(IServer server, IPath depPath, IJBossServerPublishMethod method, + public static IStatus removeDeployFailedMarker(IJBossServerPublishMethod method, IServer server, IPath depPath, IProgressMonitor monitor) throws CoreException { return removeFile(FAILED_DEPLOY, server, depPath, method, monitor); } @@ -125,7 +125,7 @@ IModule[] module, IProgressMonitor monitor) throws CoreException { IDeployableServer deployableServer = ServerConverter.getDeployableServer(server); IPath deployPath = PublishUtil.getDeployPath(method, module, deployableServer); - return removeDeployedMarkerIfExists(server, deployPath, method, monitor); + return removeDeployedMarkerIfExists(method, server, deployPath, monitor); } /** @@ -143,7 +143,7 @@ IModule[] moduleTree, IProgressMonitor monitor) throws CoreException { IPath deployPath = PublishUtil.getDeployPath(method, moduleTree, jbServer); - return removeDeployedMarkerIfExists(jbServer.getServer(), deployPath, method, monitor); + return removeDeployedMarkerIfExists(method, jbServer.getServer(), deployPath, monitor); } /** @@ -157,7 +157,7 @@ * @return the result of the removal operation * @throws CoreException */ - public static IStatus removeDeployedMarkerIfExists(IServer server, IPath depPath, IJBossServerPublishMethod method, + public static IStatus removeDeployedMarkerIfExists(IJBossServerPublishMethod method, IServer server, IPath depPath, IProgressMonitor monitor) throws CoreException { try { return removeFile(DEPLOYED, server, depPath, method, monitor); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-06-07 20:46:51 UTC (rev 31885) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-06-07 20:53:44 UTC (rev 31886) @@ -43,7 +43,7 @@ IProgressMonitor monitor) throws CoreException { IDeployableServer ds = ServerConverter.getDeployableServer(server); - DeploymentMarkerUtils.removeDeployFailedMarker(server, PublishUtil.getDeployPath(method, module, ds), method, monitor); + DeploymentMarkerUtils.removeDeployFailedMarker(method, server, PublishUtil.getDeployPath(method, module, ds), monitor); if( publishType == IJBossServerPublisher.REMOVE_PUBLISH) { DeploymentMarkerUtils.removeDeployedMarkerIfExists(method, ds, module, monitor);