diff options
author | rbrooks | 2010-08-16 04:05:22 +0000 |
---|---|---|
committer | rbrooks | 2010-08-16 04:05:22 +0000 |
commit | 81a540ee9142fc9ebe469d11349dc020d0a093bd (patch) | |
tree | 620706b3df7c2746cb0b9a8e25644b2265e84e48 /plugins/org.eclipse.osee.framework.svn | |
parent | c4321d60d38671e92d47fd30cae5c61bf57f1323 (diff) | |
download | org.eclipse.osee-81a540ee9142fc9ebe469d11349dc020d0a093bd.tar.gz org.eclipse.osee-81a540ee9142fc9ebe469d11349dc020d0a093bd.tar.xz org.eclipse.osee-81a540ee9142fc9ebe469d11349dc020d0a093bd.zip |
replace manual code with call to utility method AIFile.constructIFile
Diffstat (limited to 'plugins/org.eclipse.osee.framework.svn')
-rw-r--r-- | plugins/org.eclipse.osee.framework.svn/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.framework.svn/src/org/eclipse/osee/framework/svn/SvnAPI.java | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.svn/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.svn/META-INF/MANIFEST.MF index 7a4e42c134d..0c42bf87889 100644 --- a/plugins/org.eclipse.osee.framework.svn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.svn/META-INF/MANIFEST.MF @@ -16,7 +16,9 @@ Import-Package: org.eclipse.core.commands, org.eclipse.core.runtime.jobs, org.eclipse.jface.dialogs, org.eclipse.jface.operation, + org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.logging, + org.eclipse.osee.framework.plugin.core.util, org.eclipse.osgi.util, org.eclipse.swt.widgets, org.eclipse.team.core, diff --git a/plugins/org.eclipse.osee.framework.svn/src/org/eclipse/osee/framework/svn/SvnAPI.java b/plugins/org.eclipse.osee.framework.svn/src/org/eclipse/osee/framework/svn/SvnAPI.java index 453934302b3..b2442e91658 100644 --- a/plugins/org.eclipse.osee.framework.svn/src/org/eclipse/osee/framework/svn/SvnAPI.java +++ b/plugins/org.eclipse.osee.framework.svn/src/org/eclipse/osee/framework/svn/SvnAPI.java @@ -21,17 +21,22 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.logging.Level; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.plugin.core.util.AIFile; import org.eclipse.osee.framework.svn.entry.IRepositoryEntry; import org.eclipse.osee.framework.svn.entry.NullRepositoryEntry; import org.eclipse.osee.framework.svn.entry.RepositoryEntry; import org.eclipse.osee.framework.svn.enums.RepositoryEnums.ControlledType; import org.eclipse.osee.framework.svn.enums.RepositoryEnums.EntryFields; +import org.eclipse.osee.framework.svn.internal.Activator; import org.eclipse.team.svn.core.connector.ISVNConnector.Depth; import org.eclipse.team.svn.core.connector.SVNEntryInfo; import org.eclipse.team.svn.core.operation.remote.CheckoutOperation; @@ -107,10 +112,12 @@ public class SvnAPI { entry.addField(EntryFields.dateCommitted, dateFormat.format(new Date(info.lastChangedDate))); entry.addField(EntryFields.properTime, dateFormat.format(new Date(info.propTime))); - IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(file.toURI()); - if (files != null && files.length > 0) { - ILocalResource local = SVNRemoteStorage.instance().asLocalResource(files[0]); + try { + IFile iFile = AIFile.constructIFile(file); + ILocalResource local = SVNRemoteStorage.instance().asLocalResource(iFile); entry.setModifiedFlag(SVNUtility.getStatusText(local.getStatus())); + } catch (OseeArgumentException ex) { + OseeLog.log(Activator.class, Level.SEVERE, ex); } return entry; } |