- Continued removing VF2JS code references.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/bf093cbe Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bf093cbe Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bf093cbe Branch: refs/heads/feature-autobuild/example-maven-dirs Commit: bf093cbe5973b506523c55f1584e1d1a9cc1c304 Parents: 3724c2f Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Mon Oct 31 15:29:08 2016 +0100 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Mon Oct 31 15:29:08 2016 +0100 ---------------------------------------------------------------------- compiler-jx/pom.xml | 2 -- .../flex/compiler/clients/VF2JSToolGroup.java | 35 -------------------- .../codegen/js/flexjs/JSFlexJSDocEmitter.java | 1 - .../codegen/js/goog/JSGoogDocEmitter.java | 1 - .../js/jx/ObjectDefinePropertyEmitter.java | 1 - .../internal/projects/FlexJSProject.java | 1 - .../internal/visitor/as/ASNodeSwitch.java | 1 - .../org.apache.flex.tools.FlexToolGroup | 1 - compiler-jx/src/test/build.xml | 2 -- 9 files changed, 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf093cbe/compiler-jx/pom.xml ---------------------------------------------------------------------- diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 01a307b..f89c02f 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -48,8 +48,6 @@ <exclude>**/TestGoogClass.java</exclude> <exclude>**/TestGoogEmitter.java</exclude> <exclude>**/TestGoogFile.java</exclude> - <exclude>**/TestVF2JSFile.java</exclude> - <exclude>**/TestVF2JSMXMLApplication.java</exclude> <exclude>**/TestFlexJSMXMLApplication.java</exclude> <exclude>**/TestFlexJSMXMLScript.java</exclude> </excludes> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf093cbe/compiler-jx/src/main/java/org/apache/flex/compiler/clients/VF2JSToolGroup.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/VF2JSToolGroup.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/VF2JSToolGroup.java deleted file mode 100644 index 07cb796..0000000 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/VF2JSToolGroup.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.flex.compiler.clients; - -import org.apache.flex.tools.AbstractFlexToolGroup; - -/** - * Created by christoferdutz on 10.11.14. - */ -public class VF2JSToolGroup extends AbstractFlexToolGroup { - - public VF2JSToolGroup() { - super("VF2JS"); -// addFlexTool(new COMPJSC(new MXMLVF2JSBackend())); -// addFlexTool(new MXMLJSC(new MXMLVF2JSBackend())); - } - -} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf093cbe/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java index 80dde56..9f3afb0 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java @@ -229,7 +229,6 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter IExpressionNode enode = pnode.getNameExpressionNode(); - // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation ITypeDefinition tdef = enode.resolveType(project); if (tdef == null) continue; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf093cbe/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java index df762c5..0fa8bad 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java @@ -516,7 +516,6 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter IClassNode cnode = (IClassNode) node .getAncestorOfType(IClassNode.class); - // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation if (cnode == null) return null; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf093cbe/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ObjectDefinePropertyEmitter.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ObjectDefinePropertyEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ObjectDefinePropertyEmitter.java index d867332..1c0c2a1 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ObjectDefinePropertyEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ObjectDefinePropertyEmitter.java @@ -58,7 +58,6 @@ public class ObjectDefinePropertyEmitter extends JSSubEmitter implements IFunctionDefinition definition = node.getDefinition(); ITypeDefinition type = (ITypeDefinition) definition.getParent(); - // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation if (type == null) return; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf093cbe/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java index ee91aaf..818355c 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java @@ -79,7 +79,6 @@ public class FlexJSProject extends FlexProject public void addDependency(ICompilationUnit from, ICompilationUnit to, DependencyType dt, String qname) { - // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation List<IDefinition> dp = to.getDefinitionPromises(); if (dp.size() == 0) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf093cbe/compiler-jx/src/main/java/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java index d925b6d..cd64223 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/visitor/as/ASNodeSwitch.java @@ -104,7 +104,6 @@ public class ASNodeSwitch implements IASNodeStrategy @Override public void handle(IASNode node) { - // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation if (node == null) return; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf093cbe/compiler-jx/src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup b/compiler-jx/src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup index b28d4e0..dd9b44f 100644 --- a/compiler-jx/src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup +++ b/compiler-jx/src/main/resources/META-INF/services/org.apache.flex.tools.FlexToolGroup @@ -15,4 +15,3 @@ # limitations under the License. # org.apache.flex.compiler.clients.FlexJSToolGroup -org.apache.flex.compiler.clients.VF2JSToolGroup http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf093cbe/compiler-jx/src/test/build.xml ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/build.xml b/compiler-jx/src/test/build.xml index 771f3c8..d1d6a4a 100644 --- a/compiler-jx/src/test/build.xml +++ b/compiler-jx/src/test/build.xml @@ -67,7 +67,6 @@ <batchtest todir="${compiler}/target/junit-results"> <fileset dir="${compiler}/target/test-classes"> <include name="**/Test*.class"/> - <exclude name="**/TestVF2JS*.class"/> <exclude name="**/TestFlexJSFile.class"/> <exclude name="**/TestFlexJSMXML*.class"/> <exclude name="**/TestMXML*.class"/> @@ -132,7 +131,6 @@ <batchtest todir="${compiler}/target/junit-results"> <fileset dir="${compiler}/target/test-classes"> <include name="**/TestMXML*.class"/> - <include name="**/TestVF2JS*.class"/> </fileset> </batchtest> <formatter type="xml"/>