wlu: refactoring for lib migration
diff --git a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MappingUtil.java b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MappingUtil.java
index 03b9afa..30ba260 100755
--- a/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MappingUtil.java
+++ b/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/migration/MappingUtil.java
@@ -116,7 +116,8 @@
return null;
}
- public synchronized static final boolean conversionRequired(String libPath) {
+ public synchronized static final boolean conversionRequired(String libPath,
+ VersionUtil.VersionCheckInfo info) {
String currentNsURI = PersistenceUtil.getUMANsURI();
String libNsURI = PersistenceUtil.getUMANsURI(libPath);
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIManager.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIManager.java
index ed91516..cc00a62 100755
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIManager.java
+++ b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/LibraryUIManager.java
@@ -351,7 +351,7 @@
displayError(LibraryUIResources.openLibraryWizard_title, message);
return;
}
- if (XMILibraryUtil.isMethodLibraryUpgradeRequired(libPath)) {
+ if (XMILibraryUtil.isMethodLibraryUpgradeRequired(libPath, info)) {
if (!LibraryUIPlugin
.getDefault()
.getMsgDialog()
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard.java
index b4dbffe..b340c4e 100755
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard.java
+++ b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard.java
@@ -181,7 +181,7 @@
LibraryUIResources.openLibraryWizard_title, message);
return false;
}
- if (XMILibraryUtil.isMethodLibraryUpgradeRequired(path, libXmi)) {
+ if (XMILibraryUtil.isMethodLibraryUpgradeRequired(path, libXmi, info)) {
if (isUpgradeLibrary(callerInfo)
&& !LibraryUIPlugin
.getDefault()
diff --git a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard2.java b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard2.java
index 6c45e63..89dab73 100755
--- a/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard2.java
+++ b/plugins/org.eclipse.epf.library.ui/src/org/eclipse/epf/library/ui/wizards/OpenLibraryWizard2.java
@@ -225,7 +225,7 @@
LibraryUIResources.openLibraryWizard_title, message);
return false;
}
- if (XMILibraryUtil.isMethodLibraryUpgradeRequired(path, libXmi)) {
+ if (XMILibraryUtil.isMethodLibraryUpgradeRequired(path, libXmi, info)) {
if (isUpgradeLibrary(callerInfo)
&& !LibraryUIPlugin
.getDefault()
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java
index 0620944..37b9dc8 100755
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java
+++ b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java
@@ -193,7 +193,7 @@
if (info != null && info.result > 0) {
throw new LibraryServiceException();
} else if (XMILibraryUtil.isMethodLibraryUpgradeRequired(path
- .getAbsolutePath(), LIBRARY_XMI)) {
+ .getAbsolutePath(), LIBRARY_XMI, info)) {
throw new LibraryServiceException();
}
diff --git a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryUtil.java b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryUtil.java
index 314ed32..b6818b0 100755
--- a/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryUtil.java
+++ b/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryUtil.java
@@ -24,6 +24,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
+import org.eclipse.epf.common.serviceability.VersionUtil;
import org.eclipse.epf.common.utils.StrUtil;
import org.eclipse.epf.library.LibraryPlugin;
import org.eclipse.epf.library.LibraryResources;
@@ -236,13 +237,14 @@
* An absolute path to a method library
* @return <code>true</code> if the method library needs to be upgraded
*/
- public static boolean isMethodLibraryUpgradeRequired(String path) {
- return isMethodLibraryUpgradeRequired(path, XMILibraryManager.LIBRARY_XMI);
+ public static boolean isMethodLibraryUpgradeRequired(String path, VersionUtil.VersionCheckInfo info) {
+ return isMethodLibraryUpgradeRequired(path, XMILibraryManager.LIBRARY_XMI, info);
}
- public static boolean isMethodLibraryUpgradeRequired(String path, String libXmi) {
+ public static boolean isMethodLibraryUpgradeRequired(String path, String libXmi,
+ VersionUtil.VersionCheckInfo info) {
return org.eclipse.epf.persistence.migration.MappingUtil.conversionRequired(
- path + File.separator + libXmi);
+ path + File.separator + libXmi, info);
}
/**