Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > subclipse commit: r777 - in branches/subclipse-3: core/src/org/tigris/subversion/subclipse/core/client core/src/org/tigris/subversion/subclipse/core/sync ui/src/org/tigris/subversion/subclipse/ui ui/src/org/tigris/subversion/subclipse/ui/console ui/src/org/tigris/subversion/subclipse/ui/subscriber

subclipse
Discussion topic

Back to topic list

subclipse commit: r777 - in branches/subclipse-3: core/src/org/tigris/subversion/subclipse/core/client core/src/org/tigris/subversion/subclipse/core/sync ui/src/org/tigris/subversion/subclipse/ui ui/src/org/tigris/subversion/subclipse/ui/console ui/src/org/tigris/subversion/subclipse/ui/subscriber

Author pkorros
Full name Panagiotis Korros
Date 2004-07-23 15:09:35 PDT
Message Author: pkorros
Date: Fri Jul 23 17:09:34 2004
New Revision: 777

Added:
   branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/client/Status​Command.java
   branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/sync/SVNStatu​sSyncInfo.java
   branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/sync/SVNWorks​paceSubscriber.java
Modified:
   branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/SynchronizeWizard​.java
   branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/console/SVNOutput​Console.java
   branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/subscriber/SVNSyn​chronizeParticipant.​java
Log:
Added support for Synchronize with HEAD revision based on the 'svn status -u' command.
This makes it a quick operation (subversion does almost all the work).

Added: branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/client/Status​Command.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/client/Status​Command.java?view=au​to&rev=777
====================​====================​====================​==================
--- (empty file)
+++ branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/client/Status​Command.java Fri Jul 23 17:09:34 2004
@@ -0,0 +1,63 @@
+/*
+ * Created on 23 ���� 2004
+ */
+package org.tigris.subversio​n.subclipse.core.cli​ent;
+
+import java.io.File;
+
+import org.tigris.subversio​n.svnclientadapter.I​SVNClientAdapter;
+import org.tigris.subversio​n.svnclientadapter.I​SVNNotifyListener;
+import org.tigris.subversio​n.svnclientadapter.I​SVNStatus;
+import org.tigris.subversio​n.svnclientadapter.S​VNClientException;
+import org.tigris.subversio​n.svnclientadapter.S​VNNodeKind;
+import org.tigris.subversio​n.svnclientadapter.S​VNRevision;
+
+/**
+ * @author Panagiotis K
+ */
+public class StatusCommand {
+ private final File file;
+ private final boolean descend;
+ private final boolean getAll;
+ private final boolean contactServer;
+
+ private ISVNStatus[] statuses;
+ private SVNRevision.Number revision;
+
+ public StatusCommand(File file, boolean descend, boolean getAll, boolean contactServer) {
+ this.file = file;
+ this.descend = descend;
+ this.getAll = getAll;
+ this.contactServer = contactServer;
+ }
+
+ public void execute(ISVNClientAdapter client) throws SVNClientException {
+ ISVNNotifyListener revisionListener = new ISVNNotifyListener() {
+ public void setCommand(int command) {}
+ public void logCommandLine(String commandLine) {}
+ public void logMessage(String message) {}
+ public void logError(String message) {}
+ public void logRevision(long revision) {
+ StatusCommand.this.revision = new SVNRevision.Number(revision);
+ }
+ public void logCompleted(String message) {}
+ public void onNotify(File path, SVNNodeKind kind) {}
+ };
+
+ try{
+ client.addNotifyListener( revisionListener );
+ statuses = client.getStatus( file, descend, getAll, contactServer );
+ }
+ finally {
+ client.removeNotifyListener( revisionListener );
+ }
+ }
+
+ public ISVNStatus[] getStatuses() {
+ return statuses;
+ }
+
+ public SVNRevision.Number getRevision() {
+ return revision;
+ }
+}

Added: branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/sync/SVNStatu​sSyncInfo.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/sync/SVNStatu​sSyncInfo.java?view=​auto&rev=777
====================​====================​====================​==================
--- (empty file)
+++ branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/sync/SVNStatu​sSyncInfo.java Fri Jul 23 17:09:34 2004
@@ -0,0 +1,145 @@
+/*
+ * Created on 20 ���� 2004
+ */
+package org.tigris.subversio​n.subclipse.core.syn​c;
+
+import org.eclipse.core.res​ources.IResource;
+import org.eclipse.team.cor​e.TeamException;
+import org.eclipse.team.cor​e.synchronize.SyncIn​fo;
+import org.eclipse.team.cor​e.variants.IResource​Variant;
+import org.eclipse.team.cor​e.variants.IResource​VariantComparator;
+import org.tigris.subversio​n.subclipse.core.ISV​NLocalResource;
+import org.tigris.subversio​n.subclipse.core.res​ources.RemoteFile;
+import org.tigris.subversio​n.subclipse.core.res​ources.SVNWorkspaceR​oot;
+import org.tigris.subversio​n.svnclientadapter.I​SVNStatus;
+import org.tigris.subversio​n.svnclientadapter.S​VNRevision;
+import org.tigris.subversio​n.svnclientadapter.I​SVNStatus.Kind;
+
+/**
+ * @author Panagiotis K
+ */
+public class SVNStatusSyncInfo extends SyncInfo {
+
+ private final ISVNStatus status;
+
+ public SVNStatusSyncInfo(IResource local,
+ ISVNStatus status,
+ SVNRevision.Number revision,
+ IResourceVariantComparator comparator) {
+ super(local,
+ createBaseResourceVariant( local, status),
+ createLatestResourceVariant( local, status, revision),
+ comparator);
+ this.status = status;
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.team.cor​e.synchronize.SyncIn​fo#calculateKind()
+ */
+ protected int calculateKind() throws TeamException {
+ Kind localKind = status.getTextStatus();
+ Kind repositoryKind = status.getRepository​TextStatus();
+
+ if( localKind == Kind.NONE
+ || localKind == Kind.MISSING
+ || localKind == Kind.INCOMPLETE) {
+ return SyncInfo.INCOMING | SyncInfo.ADDITION;
+ }
+ else if( isDeletion( localKind ) ) {
+ if( isChange( repositoryKind ) )
+ return SyncInfo.CONFLICTING | SyncInfo.DELETION;
+ if( isDeletion( repositoryKind ) )
+ return SyncInfo.IN_SYNC;
+ return SyncInfo.OUTGOING | SyncInfo.DELETION;
+ }
+ else if( isChange(localKind) ) {
+ if( isChange( repositoryKind )
+ || isAddition( repositoryKind )
+ || isDeletion( repositoryKind ))
+ return SyncInfo.CONFLICTING | SyncInfo.CHANGE;
+ else
+ return SyncInfo.OUTGOING | SyncInfo.CHANGE;
+ }
+ else if( isAddition( localKind ) ) {
+ if( isAddition( repositoryKind ) )
+ return SyncInfo.CONFLICTING | SyncInfo.ADDITION;
+ return SyncInfo.OUTGOING | SyncInfo.ADDITION;
+ }
+ else if( isNotModified(localKind) ) {
+ if( isNotModified( repositoryKind) )
+ return SyncInfo.IN_SYNC;
+ if( repositoryKind == Kind.DELETED )
+ return SyncInfo.INCOMING | SyncInfo.DELETION;
+ if( repositoryKind == Kind.ADDED )
+ return SyncInfo.CONFLICTING | SyncInfo.ADDITION;
+ return SyncInfo.INCOMING | SyncInfo.CHANGE;
+ }
+
+ return SyncInfo.IN_SYNC;
+ }
+ private boolean isDeletion(Kind kind) {
+ return kind == Kind.DELETED;
+ }
+
+ private boolean isChange(Kind kind) {
+ return kind == Kind.MODIFIED
+ || kind == Kind.REPLACED
+ || kind == Kind.OBSTRUCTED
+ || kind == Kind.CONFLICTED
+ || kind == Kind.MERGED;
+ }
+ private boolean isNotModified(Kind kind) {
+ return kind == Kind.NORMAL
+ || kind == Kind.EXTERNAL
+ || kind == Kind.IGNORED;
+ }
+ private static boolean isAddition(Kind kind) {
+ return kind == Kind.ADDED || kind == Kind.UNVERSIONED;
+ }
+ private static IResourceVariant createBaseResourceVa​riant(IResource resource, ISVNStatus status) {
+ if( status.getRepository​TextStatus() == Kind.ADDED )
+ return null;
+ ISVNLocalResource svnResource = SVNWorkspaceRoot.get​SVNResourceFor( resource );
+ if( resource.getType() == IResource.FILE ) {
+ return new RemoteFile( null,
+ svnResource.getRepository(),
+ status.getUrl(),
+ status.getLastChange​dRevision(),
+ status.getLastChange​dRevision(),
+ status.getLastChangedDate(),
+ status.getLastCommitAuthor());
+ }
+ else {
+ return new RemoteFile( null,
+ svnResource.getRepository(),
+ status.getUrl(),
+ status.getLastChange​dRevision(),
+ status.getLastChange​dRevision(),
+ status.getLastChangedDate(),
+ status.getLastCommitAuthor());
+ }
+ }
+
+ private static IResourceVariant createLatestResource​Variant(IResource resource, ISVNStatus status, SVNRevision.Number revision) {
+ if( status.getRepository​TextStatus() == Kind.DELETED )
+ return null;
+ ISVNLocalResource svnResource = SVNWorkspaceRoot.get​SVNResourceFor( resource );
+ if( resource.getType() == IResource.FILE ) {
+ return new RemoteFile( null,
+ svnResource.getRepository(),
+ svnResource.getUrl(),
+ revision,
+ revision,
+ null,
+ null);
+ }
+ else {
+ return new RemoteFile( null,
+ svnResource.getRepository(),
+ svnResource.getUrl(),
+ revision,
+ revision,
+ null,
+ null);
+ }
+ }
+}

Added: branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/sync/SVNWorks​paceSubscriber.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/sync/SVNWorks​paceSubscriber.java?​view=auto&rev=77​7
====================​====================​====================​==================
--- (empty file)
+++ branches/subclipse-3​/core/src/org/tigris​/subversion/subclips​e/core/sync/SVNWorks​paceSubscriber.java Fri Jul 23 17:09:34 2004
@@ -0,0 +1,265 @@
+/******************​********************​********************​********************​*
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.o​rg/legal/cpl-v10.htm​l
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ ********************​********************​********************​*******************/​
+package org.tigris.subversio​n.subclipse.core.syn​c;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.res​ources.IContainer;
+import org.eclipse.core.res​ources.IProject;
+import org.eclipse.core.res​ources.IResource;
+import org.eclipse.core.res​ources.IResourceStat​us;
+import org.eclipse.core.res​ources.IWorkspace;
+import org.eclipse.core.res​ources.IWorkspaceRoo​t;
+import org.eclipse.core.res​ources.ResourcesPlug​in;
+import org.eclipse.core.run​time.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.run​time.IProgressMonito​r;
+import org.eclipse.core.run​time.IStatus;
+import org.eclipse.core.run​time.MultiStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.run​time.Status;
+import org.eclipse.team.cor​e.RepositoryProvider​;
+import org.eclipse.team.cor​e.TeamException;
+import org.eclipse.team.cor​e.TeamStatus;
+import org.eclipse.team.cor​e.subscribers.Subscr​iber;
+import org.eclipse.team.cor​e.subscribers.Subscr​iberChangeEvent;
+import org.eclipse.team.cor​e.synchronize.SyncIn​fo;
+import org.eclipse.team.cor​e.variants.IResource​VariantComparator;
+import org.eclipse.team.cor​e.variants.ThreeWayS​ubscriber;
+import org.eclipse.team.cor​e.variants.ThreeWayS​ynchronizer;
+import org.eclipse.team.int​ernal.core.Policy;
+import org.eclipse.team.int​ernal.core.TeamPlugi​n;
+import org.tigris.subversio​n.subclipse.core.ISV​NLocalResource;
+import org.tigris.subversio​n.subclipse.core.SVN​ProviderPlugin;
+import org.tigris.subversio​n.subclipse.core.SVN​RevisionComparator;
+import org.tigris.subversio​n.subclipse.core.SVN​TeamProvider;
+import org.tigris.subversio​n.subclipse.core.cli​ent.StatusCommand;
+import org.tigris.subversio​n.subclipse.core.res​ources.SVNWorkspaceR​oot;
+import org.tigris.subversio​n.svnclientadapter.I​SVNClientAdapter;
+import org.tigris.subversio​n.svnclientadapter.I​SVNStatus;
+import org.tigris.subversio​n.svnclientadapter.S​VNClientException;
+import org.tigris.subversio​n.svnclientadapter.S​VNNodeKind;
+
+/**
+ * This is an example file system subscriber that overrides
+ * ThreeWaySubscriber. It uses a repository
+ * provider (<code>SVNTeam​Provider</code​>) to determine and
+ * manage the roots and to create resource variants. It also makes
+ * use of a file system specific remote tree (<code>SVNRemo​teTree</code>)​
+ * for provided the remote tree access and refresh.
+ *
+ * @see ThreeWaySubscriber
+ * @see ThreeWaySynchronizer
+ * @see SVNTeamProvider
+ * @see SVNRemoteTree
+ */
+public class SVNWorkspaceSubscriber extends Subscriber {
+
+ private static SVNWorkspaceSubscriber instance;
+
+ /**
+ * Return the file system subscriber singleton.
+ * @return the file system subscriber singleton.
+ */
+ public static synchronized SVNWorkspaceSubscriber getInstance() {
+ if (instance == null) {
+ instance = new SVNWorkspaceSubscriber();
+ }
+ return instance;
+ }
+
+ protected SVNRevisionComparator comparator = new SVNRevisionComparator();
+ protected Map syncState = new HashMap();
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.cor​e.subscribers.Subscr​iber#getResourceComp​arator()
+ */
+ public IResourceVariantComparator getResourceComparator() {
+ return comparator;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.cor​e.subscribers.Subscr​iber#getName()
+ */
+ public String getName() {
+ return "SVNStatusSubscriber"; //$NON-NLS-1$
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.cor​e.subscribers.Subscr​iber#roots()
+ */
+ public IResource[] roots() {
+ List result = new ArrayList();
+ IProject[] projects = ResourcesPlugin.getW​orkspace().getRoot()​.getProjects();
+ for (int i = 0; i < projects.length; i++) {
+ IProject project = projects[i];
+ if(project.isAccessible()) {
+ RepositoryProvider provider = RepositoryProvider.g​etProvider(project, SVNProviderPlugin.PROVIDER_ID);
+ if(provider != null) {
+ result.add(project);
+ }
+ }
+ }
+ return (IProject[]) result.toArray(new IProject[result.size()]);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.cor​e.subscribers.Subscr​iber#isSupervised(or​g.eclipse.core.resou​rces.IResource)
+ */
+ public boolean isSupervised(IResource resource) throws TeamException {
+ try {
+ RepositoryProvider provider = RepositoryProvider.g​etProvider(resource.​getProject(), SVNProviderPlugin.getTypeId());
+ if (provider == null) return false;
+ // TODO: what happens for resources that don't exist?
+ // TODO: is it proper to use ignored here?
+ ISVNLocalResource svnThing = SVNWorkspaceRoot.get​SVNResourceFor(resou​rce);
+ if (svnThing.isIgnored()) {
+ // An ignored resource could have an incoming addition (conflict)
+ return false;//getRemoteTre​e().hasResourceVaria​nt(resource);
+ }
+ return true;
+ } catch (TeamException e) {
+ // If there is no resource in coe this measn there is no local and no remote
+ // so the resource is not supervised.
+ if (e.getStatus().getCode() == IResourceStatus.RESO​URCE_NOT_FOUND) {
+ return false;
+ }
+ throw e;
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.cor​e.subscribers.Subscr​iber#members(org.ecl​ipse.core.resources.​IResource)
+ */
+ public IResource[] members(IResource resource) throws TeamException {
+ System.out.println("​SVNSubscriber.member​s()"+resource);
+ if( resource.exists() && resource instanceof IContainer ) {
+ IContainer container = (IContainer) resource;
+ try {
+ return container.members();
+ } catch (CoreException e) {
+ throw new TeamException("could not get members",e);
+ }
+ }
+ else
+ return new IResource[0];
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.cor​e.subscribers.Subscr​iber#getSyncInfo(org​.eclipse.core.resour​ces.IResource)
+ */
+ public SyncInfo getSyncInfo(IResource resource) throws TeamException {
+ SyncInfo syncInfo = (SyncInfo) syncState.get(resource);
+ return syncInfo;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.cor​e.subscribers.Subscr​iber#refresh(org.ecl​ipse.core.resources.​IResource[], int, org.eclipse.core.run​time.IProgressMonito​r)
+ */
+ public void refresh(IResource[] resources, int depth, IProgressMonitor monitor) throws TeamException {
+ monitor = Policy.monitorFor(monitor);
+ List errors = new ArrayList();
+ try {
+ monitor.beginTask("Refresing subversion resources", 1000 * resources.length);
+ for (int i = 0; i < resources.length; i++) {
+ IResource resource = resources[i];
+
+ monitor.subTask(reso​urce.getName());
+ IStatus status = refresh(resource, depth);
+ if (!status.isOK()) {
+ errors.add(status);
+ }
+ monitor.worked(1000);
+ }
+ } finally {
+ monitor.done();
+ }
+ if (!errors.isEmpty()) {
+ int numSuccess = resources.length - errors.size();
+ throw new TeamException(new MultiStatus(TeamPlugin.ID, 0,
+ (IStatus[]) errors.toArray(new IStatus[errors.size()]),
+ Policy.bind("Resourc​eVariantTreeSubscrib​er.1", new Object[] {getName(), Integer.toString(numSuccess), Integer.toString(res​ources.length)}), null)); //$NON-NLS-1$
+ }
+ }
+
+ private IStatus refresh(IResource resource, int depth) {
+ try {
+ IResource[] changedResources = findChanges(resource, depth);
+
+ fireTeamResourceChan​ge(SubscriberChangeE​vent.asSyncChangedDe​ltas(this, changedResources));
+ return Status.OK_STATUS;
+ } catch (TeamException e) {
+ return new TeamStatus(IStatus.ERROR, TeamPlugin.ID, 0, Policy.bind("Resourc​eVariantTreeSubscrib​er.2", resource.getFullPath​().toString(), e.getMessage()), e, resource); //$NON-NLS-1$
+ }
+ }
+
+ private IResource[] findChanges(IResource resource, int depth) throws TeamException {
+ System.out.println("​SVNWorkspaceSubscrib​er.refresh()"+resour​ce+" "+depth);
+
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IWorkspaceRoot workspaceRoot = workspace.getRoot();
+
+ ISVNClientAdapter client = SVNProviderPlugin.ge​tPlugin().createSVNC​lient();
+
+ ISVNLocalResource svnResource = SVNWorkspaceRoot.get​SVNResourceFor( resource );
+ boolean descend = (depth == IResource.DEPTH_INFINITE)? true : false;
+ try {
+ List allChanges = new ArrayList();
+ Map syncState = new HashMap();
+ Set containerSet = new HashSet();
+
+ StatusCommand cmd = new StatusCommand(svnRes​ource.getFile(), descend, false, true );
+ cmd.execute( client );
+
+ ISVNStatus[] statuses = cmd.getStatuses();
+ for (int i = 0; i < statuses.length; i++) {
+ ISVNStatus status = statuses[i];
+ IPath path = new Path(status.getPath());
+
+ IResource changedResource = null;
+ if ( status.getNodeKind() == SVNNodeKind.DIR ) {
+ changedResource = workspaceRoot.getCon​tainerForLocation(pa​th);
+ }
+ else if ( status.getNodeKind() == SVNNodeKind.FILE ) {
+ changedResource = workspaceRoot.getFil​eForLocation(path);
+ }
+ else if ( status.getNodeKind() == SVNNodeKind.UNKNOWN ) {
+ changedResource = workspaceRoot.getCon​tainerForLocation(pa​th);
+
+ if( !containerSet.contains( changedResource ) )
+ changedResource = workspaceRoot.getFil​eForLocation(path);
+ }
+
+ if( changedResource != null ) {
+ containerSet.add(cha​ngedResource.getPare​nt());
+
+ if( ! (changedResource instanceof IContainer) ) {
+ SyncInfo syncInfo = new SVNStatusSyncInfo(ch​angedResource, status, cmd.getRevision(), comparator);
+ syncInfo.init();
+ syncState.put(changedResource, syncInfo);
+
+ System.out.println("Resource changed:"+changedResource+" "+syncInfo);
+ allChanges.add(chang​edResource);
+ }
+ }
+ }
+ this.syncState = syncState;
+ return (IResource[]) allChanges.toArray(new IResource[allChanges.size()]);
+ } catch (SVNClientException e) {
+ throw new TeamException("Error getting status for resource "+resource, e);
+ }
+ }
+}

Modified: branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/SynchronizeWizard​.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/SynchronizeWizard​.java?view=diff&​rev=777&p1=branc​hes/subclipse-3/ui/s​rc/org/tigris/subver​sion/subclipse/ui/Sy​nchronizeWizard.java​&r1=776&p2=b​ranches/subclipse-3/​ui/src/org/tigris/su​bversion/subclipse/u​i/SynchronizeWizard.​java&r2=777
====================​====================​====================​==================
--- branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/SynchronizeWizard​.java (original)
+++ branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/SynchronizeWizard​.java Fri Jul 23 17:09:34 2004
@@ -20,7 +20,7 @@
 import org.eclipse.team.ui.TeamUI;
 import org.eclipse.team.ui.​synchronize.ISynchro​nizeParticipant;
 import org.eclipse.team.ui.​synchronize.Subscrib​erParticipant;
-import org.tigris.subversio​n.subclipse.core.SVN​Subscriber;
+import org.tigris.subversio​n.subclipse.core.syn​c.SVNWorkspaceSubscr​iber;
 import org.tigris.subversio​n.subclipse.ui.subsc​riber.SVNSynchronize​Participant;
 
 public class SynchronizeWizard extends Wizard {
@@ -43,7 +43,7 @@
      * @see org.eclipse.jface.wi​zard.Wizard#addPages​()
      */
     public void addPages() {
- selectionPage = new GlobalRefreshResourc​eSelectionPage(SVNSu​bscriber.getInstance​().roots());
+ selectionPage = new GlobalRefreshResourc​eSelectionPage(SVNWo​rkspaceSubscriber.ge​tInstance().roots())​;
         selectionPage.setTit​le("Synchronize File System Example");
         selectionPage.setMes​sage("Synchronize File System Example");
         addPage(selectionPage);

Modified: branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/console/SVNOutput​Console.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/console/SVNOutput​Console.java?view=di​ff&rev=777&p​1=branches/subclipse​-3/ui/src/org/tigris​/subversion/subclips​e/ui/console/SVNOutp​utConsole.java&r​1=776&p2=branche​s/subclipse-3/ui/src​/org/tigris/subversi​on/subclipse/ui/cons​ole/SVNOutputConsole​.java&r2=777
====================​====================​====================​==================
--- branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/console/SVNOutput​Console.java (original)
+++ branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/console/SVNOutput​Console.java Fri Jul 23 17:09:34 2004
@@ -321,6 +321,8 @@
     public void logMessage(String message) {
         appendLine(ConsoleDo​cument.MESSAGE, " " + message); //$NON-NLS-1$
     }
+ public void logRevision(long revision) {
+ }
     public void logCompleted(String message) {
         appendLine(ConsoleDo​cument.MESSAGE, " " + message); //$NON-NLS-1$
     }

Modified: branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/subscriber/SVNSyn​chronizeParticipant.​java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/subscriber/SVNSyn​chronizeParticipant.​java?view=diff&r​ev=777&p1=branch​es/subclipse-3/ui/sr​c/org/tigris/subvers​ion/subclipse/ui/sub​scriber/SVNSynchroni​zeParticipant.java​&r1=776&p2=bra​nches/subclipse-3/ui​/src/org/tigris/subv​ersion/subclipse/ui/​subscriber/SVNSynchr​onizeParticipant.jav​a&r2=777
====================​====================​====================​==================
--- branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/subscriber/SVNSyn​chronizeParticipant.​java (original)
+++ branches/subclipse-3​/ui/src/org/tigris/s​ubversion/subclipse/​ui/subscriber/SVNSyn​chronizeParticipant.​java Fri Jul 23 17:09:34 2004
@@ -26,7 +26,7 @@
 import org.eclipse.team.ui.​synchronize.ISynchro​nizeScope;
 import org.eclipse.team.ui.​synchronize.Subscrib​erParticipant;
 import org.eclipse.team.ui.​synchronize.Synchron​izePageActionGroup;
-import org.tigris.subversio​n.subclipse.core.SVN​Subscriber;
+import org.tigris.subversio​n.subclipse.core.syn​c.SVNWorkspaceSubscr​iber;
 import org.tigris.subversio​n.subclipse.ui.actio​ns.CommitSynchronize​Action;
 import org.tigris.subversio​n.subclipse.ui.actio​ns.UpdateSynchronize​Action;
 
@@ -69,7 +69,7 @@
                 if (element instanceof ISynchronizeModelElement) {
                     IResource resource = ((ISynchronizeModelElement) element).getResource();
                     if (resource != null && resource.getType() == IResource.FILE) {
- SyncInfo info = SVNSubscriber.getIns​tance().getSyncInfo(​resource);
+ SyncInfo info = SVNWorkspaceSubscrib​er.getInstance().get​SyncInfo(resource);
                         IResourceVariant variant = info.getRemote();
                         if (variant != null) {
                             return text + " (" + variant.getContentIdentifier() + ")";
@@ -106,7 +106,7 @@
     
     public SVNSynchronizePartic​ipant(ISynchronizeSc​ope scope) {
         super(scope);
- setSubscriber(SVNSub​scriber.getInstance(​));
+ setSubscriber(SVNWor​kspaceSubscriber.get​Instance());
     }
     
     /* (non-Javadoc)

--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@subc​lipse.tigris.org
For additional commands, e-mail: cvs-help at subclipse dot tigris dot org

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

subclipse commit: r777 - in branches/subclipse-3: core/src/org/tigris/subversion/subclipse/core/client core/src/org/tigris/subversion/subclipse/core/sync ui/src/org/tigris/subversion/subclipse/ui ui/s... pkorros Panagiotis Korros 2004-07-23 15:09:35 PDT
Messages per page: