[jboss-cvs] JBossAS SVN: r83408 - projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-01-26 07:27:27 -0500 (Mon, 26 Jan 2009)
New Revision: 83408

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java
   projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/ModificationTypeStructureProcessor.java
Log:
Move the modification type already exists.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java	2009-01-26 12:18:36 UTC (rev 83407)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/AbstractModificationTypeMatcher.java	2009-01-26 12:27:27 UTC (rev 83408)
@@ -44,9 +44,6 @@
    public boolean determineModification(VirtualFile root, StructureMetaData structureMetaData)
    {
       ContextInfo contextInfo = structureMetaData.getContext("");
-      if (contextInfo.getModificationType() != null)
-         return true;
-
       boolean result = isModificationDetermined(root, contextInfo);
       if (result)
       {
@@ -87,9 +84,6 @@
 
    public boolean determineModification(VirtualFile root, ContextInfo contextInfo)
    {
-      if (contextInfo.getModificationType() != null)
-         return true;
-
       boolean result = isModificationDetermined(root, contextInfo);
       if (result)
       {

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/ModificationTypeStructureProcessor.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/ModificationTypeStructureProcessor.java	2009-01-26 12:18:36 UTC (rev 83407)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/modify/ModificationTypeStructureProcessor.java	2009-01-26 12:27:27 UTC (rev 83408)
@@ -78,7 +78,8 @@
     */
    protected void checkForModification(VirtualFile root, StructureMetaData structureMetaData)
    {
-      if (structureMetaData.getContext("") == null)
+      ContextInfo contex = structureMetaData.getContext("");
+      if (contex == null || contex.getModificationType() != null)
          return;
 
       if (matchers != null && matchers.isEmpty() == false)
@@ -101,7 +102,7 @@
     */
    protected void checkForModification(VirtualFile root, ContextInfo contextInfo)
    {
-      if (root == null)
+      if (root == null || contextInfo == null || contextInfo.getModificationType() != null)
          return;
 
       if (matchers != null && matchers.isEmpty() == false)