wlu: change for testMode
diff --git a/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/NewPluginAction.java b/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/NewPluginAction.java index ccdbb6f..86d0a66 100644 --- a/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/NewPluginAction.java +++ b/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/actions/NewPluginAction.java
@@ -94,7 +94,7 @@ } Shell shell = Display.getCurrent().getActiveShell(); - if (! MultiResourceEObject.jazzMode) { + if (! MultiResourceEObject.testMode) { IStatus status = UserInteractionHelper.checkModify(targetLib, shell); if (!status.isOK()) { AuthoringUIPlugin.getDefault().getMsgDialog().display(
diff --git a/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditor.java b/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditor.java index f6bbe41..292d988 100644 --- a/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditor.java +++ b/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/editors/MethodElementEditor.java
@@ -1278,10 +1278,10 @@ * @see org.eclipse.epf.authoring.ui.editors.AbstractBaseFormEditor#doSave(org.eclipse.core.runtime.IProgressMonitor) */ public void doSave(IProgressMonitor monitor) { - if (MultiResourceEObject.jazzMode) { + if (MultiResourceEObject.testMode) { try { - Services.getJazzPersister().save(elementObj); - Services.getJazzPersister().commit(); + Services.getTestPersister().save(elementObj); + Services.getTestPersister().commit(); } catch (Exception e) { e.printStackTrace(); }
diff --git a/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage.java b/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage.java index a05a92f..9150ea5 100644 --- a/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage.java +++ b/2.0/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/wizards/NewLibraryMainPage.java
@@ -174,7 +174,7 @@ */ public String getLibraryName() { String libPath = getLibraryPath(); - if (MultiResourceEObject.jazzMode) { + if (MultiResourceEObject.testMode) { return libPath; }
diff --git a/2.0/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/command/MethodElementAddCommand.java b/2.0/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/command/MethodElementAddCommand.java index 7155c11..497c301 100644 --- a/2.0/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/command/MethodElementAddCommand.java +++ b/2.0/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/command/MethodElementAddCommand.java
@@ -188,7 +188,7 @@ // Check whether the owner resource can be modified. // Collection resourcesToChange = getModifiedResources(); - if (! MultiResourceEObject.jazzMode) { + if (! MultiResourceEObject.testMode) { IStatus execStatus = UserInteractionHelper.checkModify( resourcesToChange, shell); if (!execStatus.isOK()) { @@ -252,7 +252,7 @@ * @return */ private boolean checkFolder(Object shell) { - if (MultiResourceEObject.jazzMode) { + if (MultiResourceEObject.testMode) { return true; } // if any of the elements to be added will be saved in its own file
diff --git a/2.0/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/PersistenceService.java b/2.0/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/PersistenceService.java index bba7c48..bdc2d77 100644 --- a/2.0/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/PersistenceService.java +++ b/2.0/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/library/persistence/PersistenceService.java
@@ -28,7 +28,7 @@ * @since 1.0 */ public class PersistenceService { - public static boolean jazzMode = MultiResourceEObject.jazzMode; + public static boolean testMode = MultiResourceEObject.testMode; private static final boolean DEBUG = PersistencePlugin.getDefault().isDebugging(); @@ -95,19 +95,19 @@ .getExtensionPoint( "org.eclipse.epf.library.persistence", "resourceSetFactories"); //$NON-NLS-1$ //$NON-NLS-2$ - String jazzLibPlugin = "com.ibm.rmc.jazz.uma.library"; + String epfStr = "org.eclipse.epf"; if (extensionPoint != null) { IExtension[] extensions = extensionPoint.getExtensions(); for (int i = 0; i < extensions.length; i++) { IExtension extension = extensions[i]; String pluginId = extension.getNamespaceIdentifier(); - if (jazzMode) { - if (!pluginId.equals(jazzLibPlugin)) { + if (testMode) { + if (pluginId.indexOf(epfStr) >= 0) { continue; } } else { - if (pluginId.equals(jazzLibPlugin)) { + if (pluginId.indexOf(epfStr) < 0) { continue; } }
diff --git a/2.0/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileResourceSetImpl.java b/2.0/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileResourceSetImpl.java index 54d10a5..d091d30 100644 --- a/2.0/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileResourceSetImpl.java +++ b/2.0/plugins/org.eclipse.epf.library.persistence/src/org/eclipse/epf/persistence/MultiFileResourceSetImpl.java
@@ -599,7 +599,7 @@ public void initialize(boolean loadConfigurations) { // load the ResourceManager tree and opposite features // - if (!MultiResourceEObject.jazzMode) { + if (!MultiResourceEObject.testMode) { loadResourceManagerTree(); setContainersOfLoadedElements(); @@ -959,7 +959,7 @@ File libFile = new File(path); configFolderPath = new Path(new File(libFile.getParentFile(), MultiFileSaveUtil.METHOD_CONFIGURATION_FOLDER_NAME).getCanonicalPath()); - libFolderPath = MultiResourceEObject.jazzMode ? null : new Path(libFile.getParentFile().getCanonicalPath()); + libFolderPath = MultiResourceEObject.testMode ? null : new Path(libFile.getParentFile().getCanonicalPath()); Resource res = loadLibraryResource(libFile.getCanonicalPath()); try { initialize(true);
diff --git a/2.0/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java b/2.0/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java index 541e0bc..70c5e0f 100644 --- a/2.0/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java +++ b/2.0/plugins/org.eclipse.epf.library.xmi/src/org/eclipse/epf/library/xmi/XMILibraryManager.java
@@ -252,11 +252,11 @@ protected MethodLibrary openMethodLibrary(File path) throws LibraryServiceException { File libraryXMIFile = new File(path, LIBRARY_XMI); - if (!libraryXMIFile.exists() && !MultiResourceEObject.jazzMode) { + if (!libraryXMIFile.exists() && !MultiResourceEObject.testMode) { throw new LibraryNotFoundException(); } - if (!MultiResourceEObject.jazzMode) { + if (!MultiResourceEObject.testMode) { VersionUtil.VersionCheckInfo info = VersionUtil .checkLibraryVersion(libraryXMIFile); IStatus status = XMILibraryUtil.checkVersion(libraryXMIFile, info); @@ -280,7 +280,7 @@ .getResourceSet()); // Load the method library. - String uriStr = MultiResourceEObject.jazzMode ? + String uriStr = MultiResourceEObject.testMode ? path.getName() : libraryXMIFile.getAbsolutePath(); resourceSet.loadMethodLibraries(URI.createFileURI(uriStr), Collections.EMPTY_MAP); library = resourceSet.getFirstMethodLibrary();
diff --git a/2.0/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/AbstractLibraryManager.java b/2.0/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/AbstractLibraryManager.java index 5b2c1cc..7be1f3c 100644 --- a/2.0/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/AbstractLibraryManager.java +++ b/2.0/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/AbstractLibraryManager.java
@@ -988,11 +988,11 @@ public void run() { library.getMethodPlugins().add(plugin); - if (MultiResourceEObject.jazzMode) { + if (MultiResourceEObject.testMode) { try { - Services.getJazzPersister().save(library); - Services.getJazzPersister().save(plugin); - Services.getJazzPersister().commit(); + Services.getTestPersister().save(library); + Services.getTestPersister().save(plugin); + Services.getTestPersister().commit(); } catch (Exception e) { e.printStackTrace(); }
diff --git a/2.0/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/LibraryManagerFactory.java b/2.0/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/LibraryManagerFactory.java index 68a151d..f612f3a 100644 --- a/2.0/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/LibraryManagerFactory.java +++ b/2.0/plugins/org.eclipse.epf.library/src/org/eclipse/epf/library/LibraryManagerFactory.java
@@ -95,21 +95,22 @@ IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint( EXTENSION_POINT_NAMESPACE, EXTENSION_POINT_NAME); - String jazzLibPlugin = "com.ibm.rmc.jazz.uma.library"; + String epfStr = "org.eclipse.epf"; if (extensionPoint != null) { IExtension[] extensions = extensionPoint.getExtensions(); for (int i = 0; i < extensions.length; i++) { IExtension extension = extensions[i]; String pluginId = extension.getNamespaceIdentifier(); - if (MultiResourceEObject.jazzMode) { - if (!pluginId.equals(jazzLibPlugin)) { + if (MultiResourceEObject.testMode) { + if (pluginId.indexOf(epfStr) >= 0) { continue; } } else { - if (pluginId.equals(jazzLibPlugin)) { + if (pluginId.indexOf(epfStr) < 0) { continue; } } + Bundle bundle = Platform.getBundle(pluginId); IConfigurationElement[] configElements = extension .getConfigurationElements();
diff --git a/2.0/plugins/org.eclipse.epf.services/src/org/eclipse/epf/services/Services.java b/2.0/plugins/org.eclipse.epf.services/src/org/eclipse/epf/services/Services.java index 1033bd6..8549de0 100644 --- a/2.0/plugins/org.eclipse.epf.services/src/org/eclipse/epf/services/Services.java +++ b/2.0/plugins/org.eclipse.epf.services/src/org/eclipse/epf/services/Services.java
@@ -209,13 +209,13 @@ return fileManager; } - private static FailSafeMethodLibraryPersister jazzPersister; - synchronized public static FailSafeMethodLibraryPersister getJazzPersister() { - return jazzPersister; + private static FailSafeMethodLibraryPersister testPersister; + synchronized public static FailSafeMethodLibraryPersister getTestPersister() { + return testPersister; } - synchronized public static void setJazzPersister(FailSafeMethodLibraryPersister jPersister) { - jazzPersister = jPersister; + synchronized public static void setTestPersister(FailSafeMethodLibraryPersister tPersister) { + testPersister = tPersister; }
diff --git a/2.0/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/MultiResourceEObject.java b/2.0/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/MultiResourceEObject.java index ac5bec6..3f723f3 100644 --- a/2.0/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/MultiResourceEObject.java +++ b/2.0/plugins/org.eclipse.epf.uma.ecore/src/org/eclipse/epf/uma/ecore/impl/MultiResourceEObject.java
@@ -65,7 +65,7 @@ public class MultiResourceEObject extends EDataObjectImpl implements IModelObject { - public static boolean jazzMode = false; + public static boolean testMode = false; private static final long serialVersionUID = 3258126947153097273L;