Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2015-04-24 12:35:53 +0000
committerjmisinco2015-04-24 12:35:53 +0000
commit8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b (patch)
treeffe0acb742f047e5cecc78247a361efa0cd03e8a /plugins/org.eclipse.osee.ote.version.svn
parente336a127c7645b5e1f076336d35ebbe494208fef (diff)
downloadorg.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.gz
org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.xz
org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.zip
feature: Luna, Java8, Tycho 0.22
Diffstat (limited to 'plugins/org.eclipse.osee.ote.version.svn')
-rw-r--r--plugins/org.eclipse.osee.ote.version.svn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.ote.version.svn/src/org/eclipse/osee/ote/version/svn/SvnVersionProvider.java22
2 files changed, 12 insertions, 12 deletions
diff --git a/plugins/org.eclipse.osee.ote.version.svn/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.version.svn/META-INF/MANIFEST.MF
index 9cbb6dbdbfe..b32f48a0264 100644
--- a/plugins/org.eclipse.osee.ote.version.svn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ote.version.svn/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ote.version.svn
Bundle-Version: 0.22.0.qualifier
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.eclipse.core.resources,
org.eclipse.osee.framework.logging,
org.eclipse.osee.ote.version,
diff --git a/plugins/org.eclipse.osee.ote.version.svn/src/org/eclipse/osee/ote/version/svn/SvnVersionProvider.java b/plugins/org.eclipse.osee.ote.version.svn/src/org/eclipse/osee/ote/version/svn/SvnVersionProvider.java
index 1ba11c734c0..6cd50ee6054 100644
--- a/plugins/org.eclipse.osee.ote.version.svn/src/org/eclipse/osee/ote/version/svn/SvnVersionProvider.java
+++ b/plugins/org.eclipse.osee.ote.version.svn/src/org/eclipse/osee/ote/version/svn/SvnVersionProvider.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.ote.version.FileVersion;
import org.eclipse.osee.ote.version.FileVersionInformationProvider;
import org.eclipse.team.svn.core.connector.ISVNConnector;
-import org.eclipse.team.svn.core.connector.ISVNConnector.Depth;
+import org.eclipse.team.svn.core.connector.SVNDepth;
import org.eclipse.team.svn.core.connector.SVNEntryInfo;
import org.eclipse.team.svn.core.connector.SVNEntryRevisionReference;
import org.eclipse.team.svn.core.extension.CoreExtensionsManager;
@@ -29,36 +29,36 @@ import org.eclipse.team.svn.core.utility.SVNUtility;
public class SvnVersionProvider implements FileVersionInformationProvider {
-
protected boolean isSvn(File file) {
File svn = new File(file, SVNUtility.getSVNFolderName());
return svn.exists();
}
-
+
@Override
public void getFileVersions(List<File> scriptFiles, Map<File, FileVersion> versions) {
IProject[] workspaceProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
ScriptToProject collection = new ScriptToProject(workspaceProjects);
-
- for(File scriptFile:scriptFiles){
+
+ for (File scriptFile : scriptFiles) {
collection.add(scriptFile);
}
- ISVNConnector proxy = CoreExtensionsManager.instance().getSVNConnectorFactory().newInstance();
- for (String projectName : collection.getProjectsSet()) {
+ ISVNConnector proxy = CoreExtensionsManager.instance().getSVNConnectorFactory().createConnector();
+ for (String projectName : collection.getProjectsSet()) {
try {
- SVNEntryInfo []st = SVNUtility.info(proxy, new SVNEntryRevisionReference(projectName), Depth.INFINITY, new SVNNullProgressMonitor());
+ SVNEntryInfo[] st =
+ SVNUtility.info(proxy, new SVNEntryRevisionReference(projectName), SVNDepth.INFINITY,
+ new SVNNullProgressMonitor());
for (SVNEntryInfo entry : st) {
String svnEntryPath = entry.path;
String itemToMatch = svnEntryPath.substring(svnEntryPath.lastIndexOf("/") + 1);
File scriptFile = collection.getScriptFileMatch(projectName, itemToMatch);
- if(scriptFile != null){
+ if (scriptFile != null) {
versions.put(scriptFile, new SvnFileVersion(entry));
}
}
- }
- catch (Exception ex) {
+ } catch (Exception ex) {
OseeLog.logf(getClass(), Level.SEVERE, "SVNConnectorException while retrieving script SVN info ", ex);
}
}

Back to the top