Author: scabanovich
Date: 2011-06-10 19:28:18 -0400 (Fri, 10 Jun 2011)
New Revision: 32033
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
Log:
JBIDE-9116
https://issues.jboss.org/browse/JBIDE-9116
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2011-06-10
22:53:38 UTC (rev 32032)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2011-06-10
23:28:18 UTC (rev 32033)
@@ -89,7 +89,7 @@
if(result) fire();
if(paths == null && result) return true;
- updateFileSystems(paths);
+ if(paths != null) updateFileSystems(paths);
fsVersion = pathsVersion;
return result;
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2011-06-10
22:53:38 UTC (rev 32032)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2011-06-10
23:28:18 UTC (rev 32033)
@@ -220,7 +220,7 @@
static Map<IProject, Set<String>> checked = new HashMap<IProject,
Set<String>>();
public static boolean checkModelNature(IProject project, String nature) {
- if(project == null || !project.isOpen()) {
+ if(project == null || !project.isOpen() ||
!project.isSynchronized(IResource.DEPTH_ONE)) {
if(project != null && checked.containsKey(project)) {
checked.remove(project);
}
@@ -239,10 +239,7 @@
ns.add(nature);
return true;
}
- if(!project.isSynchronized(1)) {
- return false;
- }
- ns.add(nature);
+// ns.add(nature);
return true;
}