Author: dmaliarevich Date: 2009-04-29 04:18:17 -0400 (Wed, 29 Apr 2009) New Revision: 14955 Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java Log: https://jira.jboss.org/jira/browse/JBIDE-3211, code adjustment. Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2009-04-29 07:58:47 UTC (rev 14954) +++ trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2009-04-29 08:18:17 UTC (rev 14955) @@ -106,17 +106,6 @@ */ String s = null; /* - * Old preferences format property value. - */ - String old = null; - try { - old = resource.getPersistentProperty(getPropertyName()); - } catch (CoreException e) { - /* - * Ignore, there is no properties for this resource. - */ - } - /* * https://jira.jboss.org/jira/browse/JBIDE-3211 * Storing project preferences to project scope in .settings */ @@ -135,6 +124,17 @@ } } if (s == null || s.length() == 0) { + /* + * Old preferences format property value. + */ + String old = null; + try { + old = resource.getPersistentProperty(getPropertyName()); + } catch (CoreException e) { + /* + * Ignore, there is no properties for this resource. + */ + } if (old == null || old.length() == 0) { return new String[0]; } else { @@ -262,18 +262,8 @@ * Property value */ String s = null; + /* - * Old preferences format property value. - */ - String old = null; - try { - old = ModelPlugin.getWorkspace().getRoot().getPersistentProperty(getPropertyName()); - } catch (CoreException e) { - /* - * Ignore, there is no properties for this resource. - */ - } - /* * https://jira.jboss.org/jira/browse/JBIDE-3211 Reading project * Reading global preferences from instance scope. */ @@ -289,8 +279,21 @@ */ if (s != null && s.length() > 0) { parseExternalResources(s); - } else if (old != null && old.length() > 0) { - parseExternalResources(old); + } else { + /* + * Old preferences format property value. + */ + String old = null; + try { + old = ModelPlugin.getWorkspace().getRoot().getPersistentProperty(getPropertyName()); + } catch (CoreException e) { + /* + * Ignore, there is no properties for this resource. + */ + } + if (old != null && old.length() > 0) { + parseExternalResources(old); + } } } return allExternalResources;