[Openutils-svn] SF.net SVN: openutils:[3730] trunk/openutils-mgnlutils/src/main/java/it/ openutils/mgnlutils/templating/ExtendedTemplate.java

[<fg...@us...>]

Revision: 3730
          http://openutils.svn.sourceforge.net/openutils/?rev=3730&view=rev
Author:   fgiust
Date:     2011-12-19 10:17:54 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
Check on repository name: combine with other options

Modified Paths:
--------------
    trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java

Modified: trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java
===================================================================
--- trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java	2011-12-02 15:39:01 UTC (rev 3729)
+++ trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/templating/ExtendedTemplate.java	2011-12-19 10:17:54 UTC (rev 3730)
@@ -168,19 +168,18 @@
         {
             try
             {
-                if (repositories.contains(node.getWorkspace().getName()))
+                if (!repositories.contains(node.getWorkspace().getName()))
                 {
-                    return true;
+                    return false;
                 }
             }
             catch (RepositoryException e)
             {
                 // ignore, should never happen
             }
-            return false;
         }
 
-        if (levels != null && !levels.isEmpty())
+        if (available && (levels != null && !levels.isEmpty()))
         {
             try
             {
@@ -196,7 +195,7 @@
             }
         }
 
-        if (StringUtils.isNotBlank(parentPath))
+        if (available && StringUtils.isNotBlank(parentPath))
         {
             if (!StringUtils.contains(node.getHandle(), parentPath))
             {
@@ -204,7 +203,7 @@
             }
         }
 
-        if (parentTemplates != null && !parentTemplates.isEmpty())
+        if (available && (parentTemplates != null && !parentTemplates.isEmpty()))
         {
             try
             {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.