You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/12/26 06:01:38 UTC

[royale-compiler] 03/12: interface changed in Guava

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 9deda7f06c0062725572dee918f6cbfea6c5b467
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Dec 25 21:42:44 2018 -0800

    interface changed in Guava
---
 .../compiler/tools/problems/BaseProblemGeneratorMojo.java   |  5 +++++
 .../royale/compiler/internal/parsing/as/OffsetLookup.java   |  6 ++++++
 .../internal/abc/ScopedDefinitionTraitsVisitor.java         |  8 +++++++-
 .../internal/as/codegen/MXMLClassDirectiveProcessor.java    | 10 ++++++++++
 .../internal/css/semantics/CSSSemanticAnalyzer.java         | 13 +++++++++++++
 .../compiler/internal/definitions/FunctionDefinition.java   |  6 ++++++
 .../compiler/internal/definitions/NamespaceDefinition.java  |  6 ++++++
 .../compiler/internal/projects/SourcePathManager.java       | 13 ++++++++++++-
 .../compiler/internal/scopes/NamespaceSetPredicate.java     |  6 ++++++
 .../apache/royale/compiler/internal/scopes/TypeScope.java   |  6 ++++++
 .../royale/compiler/internal/tree/as/FunctionNode.java      | 10 ++++++++++
 11 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/BaseProblemGeneratorMojo.java b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/BaseProblemGeneratorMojo.java
index 3af7b1c..6aa695e 100644
--- a/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/BaseProblemGeneratorMojo.java
+++ b/compiler-build-tools/src/main/java/org/apache/royale/compiler/tools/problems/BaseProblemGeneratorMojo.java
@@ -113,6 +113,11 @@ public abstract class BaseProblemGeneratorMojo extends AbstractMojo
                     {
                         return isProblemClass(input);
                     }
+                    @Override
+                    public boolean test(File input)
+                    {
+                        return apply(input);
+                    }
                 });
     }
 
diff --git a/compiler-common/src/main/java/org/apache/royale/compiler/internal/parsing/as/OffsetLookup.java b/compiler-common/src/main/java/org/apache/royale/compiler/internal/parsing/as/OffsetLookup.java
index 376fb47..585b86e 100644
--- a/compiler-common/src/main/java/org/apache/royale/compiler/internal/parsing/as/OffsetLookup.java
+++ b/compiler-common/src/main/java/org/apache/royale/compiler/internal/parsing/as/OffsetLookup.java
@@ -169,6 +169,12 @@ public class OffsetLookup
                     {
                         return cue.filename.equals(filename);
                     }
+                    
+                    @Override
+                    public boolean test(OffsetCue input)
+                    {
+                        return apply(input);
+                    }
                 });
 
         // Find a list of OffsetCues before the local offset.
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/abc/ScopedDefinitionTraitsVisitor.java b/compiler/src/main/java/org/apache/royale/compiler/internal/abc/ScopedDefinitionTraitsVisitor.java
index 82d7002..0298127 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/abc/ScopedDefinitionTraitsVisitor.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/abc/ScopedDefinitionTraitsVisitor.java
@@ -256,7 +256,13 @@ public class ScopedDefinitionTraitsVisitor implements ITraitsVisitor
             public boolean apply(Namespace ns)
             {
                 return ns.getApiVersion() != ABCConstants.NO_API_VERSION;
-            } }); 
+            }
+            @Override
+            public boolean test(Namespace input)
+            {
+                return apply(input);
+            }
+            }); 
     }
     
     public static String getDefinitionName(Name name)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java b/compiler/src/main/java/org/apache/royale/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java
index b92da21..0297b3c 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/as/codegen/MXMLClassDirectiveProcessor.java
@@ -2852,6 +2852,11 @@ public class MXMLClassDirectiveProcessor extends ClassDirectiveProcessor
         {
             return node instanceof IMXMLInstanceNode;
         }
+        @Override
+        public boolean test(IASNode input)
+        {
+            return apply(input);
+        }
     };
 
     /**
@@ -2864,6 +2869,11 @@ public class MXMLClassDirectiveProcessor extends ClassDirectiveProcessor
         {
             return node instanceof IMXMLSpecifierNode;
         }
+        @Override
+        public boolean test(IASNode input)
+        {
+            return apply(input);
+        }
     };
     
     /**
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/css/semantics/CSSSemanticAnalyzer.java b/compiler/src/main/java/org/apache/royale/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
index b0f1f91..6573c57 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/css/semantics/CSSSemanticAnalyzer.java
@@ -406,6 +406,13 @@ public class CSSSemanticAnalyzer
             }
             return false;
         }
+        
+        @Override
+        public boolean test(ICSSRule input)
+        {
+            return apply(input);
+        }
+
     }
 
     /**
@@ -447,6 +454,12 @@ public class CSSSemanticAnalyzer
             }
             return true;
         }
+        
+        @Override
+        public boolean test(ICSSRule input)
+        {
+            return apply(input);
+        }
     }
 
     /**
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/FunctionDefinition.java b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/FunctionDefinition.java
index fdcbf80..fdbbb25 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/FunctionDefinition.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/FunctionDefinition.java
@@ -652,6 +652,12 @@ public class FunctionDefinition extends ScopedDefinitionBase implements IFunctio
         	if (!definition.isPrivate()) return true;
             return findPrivates;
         }
+        
+        @Override
+        public boolean test(IDefinition input)
+        {
+            return apply(input);
+        }
     }
 
 }
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/NamespaceDefinition.java b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/NamespaceDefinition.java
index fc1fd10..835e6b7 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/NamespaceDefinition.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/definitions/NamespaceDefinition.java
@@ -1948,6 +1948,12 @@ public abstract class NamespaceDefinition extends DefinitionBase implements INam
                 }
                 return true;
             }
+            
+            @Override
+            public boolean test(IDefinition input)
+            {
+                return apply(input);
+            }
 
             /**
              * Determine if a reference from one definition to another should be considered a forward
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/SourcePathManager.java b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/SourcePathManager.java
index 366cab1..da6b74f 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/SourcePathManager.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/SourcePathManager.java
@@ -256,7 +256,13 @@ public final class SourcePathManager
                         {
                             DefinitionPriority defPriority = (DefinitionPriority)cu.getDefinitionPriority();
                             return defPriority.getBasePriority() == DefinitionPriority.BasePriority.SOURCE_PATH;
-                        }});
+                        }
+                        @Override
+                        public boolean test(ICompilationUnit input)
+                        {
+                            return apply(input);
+                        }
+                        });
                 unitsToRemove.addAll(sourcePathCompilationUnitsToRemove);
             }
         }
@@ -335,6 +341,11 @@ public final class SourcePathManager
                         DefinitionPriority priority = ((DefinitionPriority)compilationUnit.getDefinitionPriority());
                         return priority.getBasePriority() == DefinitionPriority.BasePriority.SOURCE_PATH;
                     }
+                    @Override
+                    public boolean test(ICompilationUnit input)
+                    {
+                        return apply(input);
+                    }
                 });
     }
     
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/NamespaceSetPredicate.java b/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/NamespaceSetPredicate.java
index c2684eb..44e775a 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/NamespaceSetPredicate.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/NamespaceSetPredicate.java
@@ -88,6 +88,12 @@ public class NamespaceSetPredicate implements Predicate<IDefinition>
         return false;
     }
 
+    @Override
+    public boolean test(IDefinition input)
+    {
+        return apply(input);
+    }
+
     /**
      * Does the underlying namespace set contain the namespace passed in
      * @param d the namespace to check
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/TypeScope.java b/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/TypeScope.java
index 07ff53d..2a2a40b 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/TypeScope.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/scopes/TypeScope.java
@@ -662,5 +662,11 @@ public class TypeScope extends ASScope
         {
             return findStatics == definition.isStatic();
         }
+        
+        @Override
+        public boolean test(IDefinition input)
+        {
+            return apply(input);
+        }
     }
 }
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/FunctionNode.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/FunctionNode.java
index c48154b..e765d7b 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/FunctionNode.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/FunctionNode.java
@@ -902,6 +902,11 @@ public class FunctionNode extends BaseTypedDefinitionNode implements IFunctionNo
             {
                 return problem.getLine() == line;
             }
+            @Override
+            public boolean test(ICompilerProblem input)
+            {
+                return apply(input);
+            }
         };
     }
 
@@ -917,6 +922,11 @@ public class FunctionNode extends BaseTypedDefinitionNode implements IFunctionNo
             {
                 return problemClass.isInstance(problem);
             }
+            @Override
+            public boolean test(ICompilerProblem input)
+            {
+                return apply(input);
+            }
         };
     }