Author: adietish Date: 2011-08-16 11:03:15 -0400 (Tue, 16 Aug 2011) New Revision: 33972 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublisher.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitUtils.java Log: [JBIDE-9512] implemented simple commit method for egit Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-16 13:05:51 UTC (rev 33971) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/META-INF/MANIFEST.MF 2011-08-16 15:03:15 UTC (rev 33972) @@ -16,3 +16,6 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: JBoss by Red Hat +Export-Package: org.jboss.ide.eclipse.as.egit.core, + org.jboss.ide.eclipse.as.egit.core.internal;x-friends:="org.jboss.ide.eclipse.as.egit.test", + org.jboss.ide.eclipse.as.egit.core.module Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java (from rev 33955, trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java 2011-08-16 15:03:15 UTC (rev 33972) @@ -0,0 +1,64 @@ +package org.jboss.ide.eclipse.as.egit.core; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; +import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; + +public class EgitBehaviourDelegate implements IJBossBehaviourDelegate { + + private static final String ID = "egit"; + + @Override + public String getBehaviourTypeId() { + return ID; + } + + @Override + public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) { + } + + @Override + public void stop(boolean force) { + } + + @Override + public void publishStart(IProgressMonitor monitor) throws CoreException { + } + + @Override + public void publishFinish(IProgressMonitor monitor) throws CoreException { + } + + @Override + public void onServerStarting() { + // do nothing + } + + @Override + public void onServerStopping() { + // do nothing + } + + @Override + public IStatus canChangeState(String launchMode) { + // do nothing + return Status.OK_STATUS; + } + + /** + * remove from interface + */ + @Override + public String getDefaultStopArguments() throws CoreException { + return null; + } + + @Override + public void dispose() { + // do nothing + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitBehaviourDelegate.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublisher.java (from rev 33955, trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublisher.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublisher.java 2011-08-16 15:03:15 UTC (rev 33972) @@ -0,0 +1,30 @@ +package org.jboss.ide.eclipse.as.egit.core; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.model.IModuleResourceDelta; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; + +public class EgitPublisher implements IJBossServerPublisher { + + @Override + public boolean accepts(String method, IServer server, IModule[] module) { + return false; + } + + @Override + public int getPublishState() { + return 0; + } + + @Override + public IStatus publishModule(IJBossServerPublishMethod method, IServer server, IModule[] module, int publishType, + IModuleResourceDelta[] delta, IProgressMonitor monitor) throws CoreException { + return null; + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitPublisher.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java 2011-08-16 13:05:51 UTC (rev 33971) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitBehaviourDelegate.java 2011-08-16 15:03:15 UTC (rev 33972) @@ -1,64 +0,0 @@ -package org.jboss.ide.eclipse.as.egit.core.internal; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; - -public class EgitBehaviourDelegate implements IJBossBehaviourDelegate { - - private static final String ID = "egit"; - - @Override - public String getBehaviourTypeId() { - return ID; - } - - @Override - public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) { - } - - @Override - public void stop(boolean force) { - } - - @Override - public void publishStart(IProgressMonitor monitor) throws CoreException { - } - - @Override - public void publishFinish(IProgressMonitor monitor) throws CoreException { - } - - @Override - public void onServerStarting() { - // do nothing - } - - @Override - public void onServerStopping() { - // do nothing - } - - @Override - public IStatus canChangeState(String launchMode) { - // do nothing - return Status.OK_STATUS; - } - - /** - * remove from interface - */ - @Override - public String getDefaultStopArguments() throws CoreException { - return null; - } - - @Override - public void dispose() { - // do nothing - } - -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java 2011-08-16 13:05:51 UTC (rev 33971) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitPublisher.java 2011-08-16 15:03:15 UTC (rev 33972) @@ -1,30 +0,0 @@ -package org.jboss.ide.eclipse.as.egit.core.internal; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.model.IModuleResourceDelta; -import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; -import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; - -public class EgitPublisher implements IJBossServerPublisher { - - @Override - public boolean accepts(String method, IServer server, IModule[] module) { - return false; - } - - @Override - public int getPublishState() { - return 0; - } - - @Override - public IStatus publishModule(IJBossServerPublishMethod method, IServer server, IModule[] module, int publishType, - IModuleResourceDelta[] delta, IProgressMonitor monitor) throws CoreException { - return null; - } - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitUtils.java 2011-08-16 13:05:51 UTC (rev 33971) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/internal/EgitUtils.java 2011-08-16 15:03:15 UTC (rev 33972) @@ -1,6 +1,5 @@ package org.jboss.ide.eclipse.as.egit.core.internal; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -8,20 +7,43 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.egit.core.op.CommitOperation; +import org.eclipse.egit.core.project.RepositoryMapping; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.UserConfig; public class EgitUtils { public static void commit(IProject project) throws CoreException { - IFile[] commitables = new IFile[]{}; + IFile[] commitables = new IFile[] {}; Collection<IFile> untracked = Collections.emptyList(); + Repository repository = getRepository(project); + UserConfig userConfig = getUserConfig(repository); CommitOperation op = new CommitOperation( commitables, - new ArrayList<IFile>(), - untracked, - "dummyAuthor", - "dummyCommitter", + null, // committables + null, // untracked + getSubject(userConfig.getAuthorName(), userConfig.getAuthorEmail()), + getSubject(userConfig.getCommitterName(), userConfig.getCommitterEmail()), "Initial commit"); + op.setCommitAll(true); + op.setRepository(repository ); op.execute(null); } + + private static Repository getRepository(IProject project) { + RepositoryMapping repositoryMapping = RepositoryMapping.getMapping(project); + if (repositoryMapping == null) { + return null; + } + return repositoryMapping.getRepository(); + } + + private static UserConfig getUserConfig(Repository repository) { + return repository.getConfig().get(UserConfig.KEY); + } + + private static String getSubject(String name, String email) { + return new StringBuilder().append(name).append(" <").append(email).append('>').toString(); + } }