You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/10/07 07:23:51 UTC

git commit: [flex-utilities] [refs/heads/develop] - - Changed the AirFilter to also accept Windows type paths ("\" instead of "/")

Repository: flex-utilities
Updated Branches:
  refs/heads/develop fa9a4fe93 -> 98b189d88


- Changed the AirFilter to also accept Windows type paths ("\" instead of "/")


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/98b189d8
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/98b189d8
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/98b189d8

Branch: refs/heads/develop
Commit: 98b189d8820cf51f007d5779841b7f18970c3b88
Parents: fa9a4fe
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Oct 7 09:23:43 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Oct 7 09:23:43 2016 +0200

----------------------------------------------------------------------
 .../utilities/converter/air/AirConverter.java     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/98b189d8/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
----------------------------------------------------------------------
diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
index d00986f..7e9fadf 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
+++ b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
@@ -416,15 +416,15 @@ public class AirConverter extends BaseConverter implements Converter {
             String relativePath = pathname.getAbsolutePath().substring(
                     rootSourceDirectory.getAbsolutePath().length());
 
-            boolean result = "/AIR SDK license.pdf".equals(relativePath) ||
-                    "/AIR SDK Readme.txt".equals(relativePath) ||
-                    "/airsdk.xml".equals(relativePath) ||
-                    relativePath.startsWith("/frameworks/projects/air/") ||
-                    relativePath.startsWith("/include/") ||
-                    relativePath.startsWith("/install/") ||
-                    relativePath.startsWith("/samples/");
-
-            if(relativePath.startsWith("/frameworks/libs/air/")) {
+            boolean result = "/AIR SDK license.pdf".equals(relativePath) || "\\AIR SDK license.pdf".equals(relativePath) ||
+                    "/AIR SDK Readme.txt".equals(relativePath) || "\\AIR SDK Readme.txt".equals(relativePath) ||
+                    "/airsdk.xml".equals(relativePath) || "\\airsdk.xml".equals(relativePath) ||
+                    relativePath.startsWith("/frameworks/projects/air/") || relativePath.startsWith("\\frameworks\\projects\\air\\") ||
+                    relativePath.startsWith("/include/") || relativePath.startsWith("\\include\\") ||
+                    relativePath.startsWith("/install/") || relativePath.startsWith("\\install\\") ||
+                    relativePath.startsWith("/samples/") || relativePath.startsWith("\\samples\\");
+
+            if(relativePath.startsWith("/frameworks/libs/air/") || relativePath.startsWith("\\frameworks\\libs\\air\\")) {
                 result = !(pathname.getName().endsWith(".swc") || pathname.getName().endsWith(".swf"));
             }