wlu: minor adjust for 191740 fix
diff --git a/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryDiffManager.java b/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryDiffManager.java index f0e1a90..b1d14ae 100644 --- a/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryDiffManager.java +++ b/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryDiffManager.java
@@ -22,6 +22,7 @@ import org.eclipse.epf.uma.Dimension; import org.eclipse.epf.uma.MethodConfiguration; import org.eclipse.epf.uma.MethodElement; +import org.eclipse.epf.uma.MethodElementProperty; import org.eclipse.epf.uma.MethodLibrary; import org.eclipse.epf.uma.MethodPackage; import org.eclipse.epf.uma.MethodPlugin; @@ -270,7 +271,7 @@ recursive, full); } } - } else if ( !(e instanceof Point || e instanceof Dimension) ){ + } else if ( !(e instanceof Point || e instanceof Dimension || e instanceof MethodElementProperty) ){ ImportPlugin.getDefault().getLogger().logError( "Import error. " + e + " is not a MethodElement object"); //$NON-NLS-1$ //$NON-NLS-2$ }
diff --git a/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java b/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java index e41d817..9ab06bb 100644 --- a/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java +++ b/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java
@@ -33,10 +33,12 @@ import org.eclipse.epf.export.services.DiagramHandler; import org.eclipse.epf.importing.ImportPlugin; import org.eclipse.epf.importing.ImportResources; +import org.eclipse.epf.library.ILibraryResourceManager; import org.eclipse.epf.library.LibraryService; import org.eclipse.epf.library.edit.util.TngUtil; import org.eclipse.epf.library.services.SafeUpdateController; import org.eclipse.epf.library.util.LibraryUtil; +import org.eclipse.epf.library.util.ResourceHelper; import org.eclipse.epf.persistence.MultiFileResourceSetImpl; import org.eclipse.epf.persistence.MultiFileXMIHelperImpl; import org.eclipse.epf.services.IFileBasedLibraryPersister; @@ -730,7 +732,8 @@ MethodElement oldObj = diffMgr.getExistingElement(newObj.getGuid()); if ( oldObj == null ) { oldValue.add(newObj); - //logNewElement(newObj); + //logNewElement(newObj); + logNewElementUnderExistingPlugin(newObj); } else { oldValue.add(oldObj); doReplaceElement(oldObj, newObj); @@ -806,6 +809,7 @@ else if ( canReset(n) ) { element.eSet(feature, newValue); //logNewElement(n); + logNewElementUnderExistingPlugin(n); } else { @@ -817,6 +821,7 @@ element.eSet(feature, newValue); //logNewElement(n); + logNewElementUnderExistingPlugin(n); } } } @@ -1712,6 +1717,14 @@ plugin.setUserChangeable(new Boolean(false)); } } - } + } + + private void logNewElementUnderExistingPlugin(MethodElement newObj) { + ILibraryResourceManager libResMgr = ResourceHelper.getResourceMgr(newObj); + String pluginPath = libResMgr.getPhysicalPluginPath(newObj); + if (pluginPath != null) { + logNewElement(newObj); + } + } } \ No newline at end of file