Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bfffd714 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfffd714 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfffd714 Branch: refs/heads/master Commit: bfffd714aff0f1c58070574939c4c36df9b7d092 Parents: 553788b Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Oct 14 14:48:32 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Oct 14 14:48:32 2017 +0200 ---------------------------------------------------------------------- .../apache/camel/parser/RouteBuilderParser.java | 2 +- .../org/apache/camel/parser/XmlRouteParser.java | 7 +- .../apache/camel/parser/graph/RenderRoute.java | 70 -------------------- .../parser/helper/CamelXmlTreeParserHelper.java | 5 +- .../camel/parser/model/CamelNodeDetails.java | 6 +- .../parser/model/CamelNodeDetailsFactory.java | 8 +-- .../camel/parser/java/RoasterJavaDslTest.java | 2 +- .../java/RoasterJavaDslTwoRoutesTest.java | 2 +- 8 files changed, 16 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java ---------------------------------------------------------------------- diff --git a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java index de1d51f..703d54e 100644 --- a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java +++ b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/RouteBuilderParser.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.camel.parser.helper.CamelJavaTreeParserHelper; import org.apache.camel.parser.helper.CamelJavaParserHelper; +import org.apache.camel.parser.helper.CamelJavaTreeParserHelper; import org.apache.camel.parser.model.CamelEndpointDetails; import org.apache.camel.parser.model.CamelNodeDetails; import org.apache.camel.parser.model.CamelRouteDetails; http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java ---------------------------------------------------------------------- diff --git a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java index 5512837..3c9e5ee 100644 --- a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java +++ b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/XmlRouteParser.java @@ -20,17 +20,16 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.apache.camel.parser.helper.CamelXmlTreeParserHelper; -import org.apache.camel.parser.model.CamelNodeDetails; -import org.apache.camel.parser.model.CamelNodeDetailsFactory; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.apache.camel.parser.helper.CamelJavaParserHelper; import org.apache.camel.parser.helper.CamelXmlHelper; +import org.apache.camel.parser.helper.CamelXmlTreeParserHelper; import org.apache.camel.parser.helper.XmlLineNumberParser; - import org.apache.camel.parser.model.CamelEndpointDetails; +import org.apache.camel.parser.model.CamelNodeDetails; +import org.apache.camel.parser.model.CamelNodeDetailsFactory; import org.apache.camel.parser.model.CamelRouteDetails; import org.apache.camel.parser.model.CamelSimpleExpressionDetails; import org.jboss.forge.roaster.model.util.Strings; http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/graph/RenderRoute.java ---------------------------------------------------------------------- diff --git a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/graph/RenderRoute.java b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/graph/RenderRoute.java deleted file mode 100644 index a1f4807..0000000 --- a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/graph/RenderRoute.java +++ /dev/null @@ -1,70 +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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> - * 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.camel.parser.graph; - -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import javax.imageio.ImageIO; - -import org.apache.camel.parser.model.CamelNodeDetails; - -/** - * @deprecated experiment to render a route via Java image - */ -@Deprecated -public class RenderRoute { - - public static void main(String[] args) { - RenderRoute render = new RenderRoute(); - render(null); - } - - public static void render(CamelNodeDetails root) { - // TODO: - try { - int width = 200, height = 200; - - // TYPE_INT_ARGB specifies the image format: 8-bit RGBA packed - // into integer pixels -// BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); - BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); - - Graphics2D ig2 = bi.createGraphics(); - - ig2.drawRect(10, 10, 80, 40); - ig2.drawLine(45, 50, 45, 80); - ig2.drawRect(10, 80, 80, 40); - - Font font = new Font("Arial", Font.BOLD, 20); - ig2.setFont(font); - String message = "Apache Camel"; - FontMetrics fontMetrics = ig2.getFontMetrics(); - int stringWidth = fontMetrics.stringWidth(message); - int stringHeight = fontMetrics.getAscent(); - ig2.setPaint(Color.black); - ig2.drawString(message, (width - stringWidth) / 2, height / 2 + stringHeight / 4); - - ImageIO.write(bi, "PNG", new File("target/route.png")); - - } catch (IOException ie) { - ie.printStackTrace(); - } - - } -} http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java ---------------------------------------------------------------------- diff --git a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java index 25396ba..23c291b 100644 --- a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java +++ b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlTreeParserHelper.java @@ -20,11 +20,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + import org.apache.camel.catalog.CamelCatalog; import org.apache.camel.catalog.DefaultCamelCatalog; import org.apache.camel.catalog.JSonSchemaHelper; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.apache.camel.parser.model.CamelNodeDetails; import org.apache.camel.parser.model.CamelNodeDetailsFactory; http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetails.java ---------------------------------------------------------------------- diff --git a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetails.java b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetails.java index bd2a99c..d759037 100644 --- a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetails.java +++ b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetails.java @@ -5,9 +5,9 @@ * 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetailsFactory.java ---------------------------------------------------------------------- diff --git a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetailsFactory.java b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetailsFactory.java index 33b15c8..a59d39a 100644 --- a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetailsFactory.java +++ b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelNodeDetailsFactory.java @@ -5,9 +5,9 @@ * 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 - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> + * + * 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. @@ -16,7 +16,7 @@ */ package org.apache.camel.parser.model; -public class CamelNodeDetailsFactory { +public final class CamelNodeDetailsFactory { private int order; http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java ---------------------------------------------------------------------- diff --git a/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java b/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java index 268022a..2173742 100644 --- a/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java +++ b/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTest.java @@ -42,7 +42,7 @@ public class RoasterJavaDslTest extends CamelTestSupport { JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java")); List<CamelNodeDetails> list = RouteBuilderParser.parseRouteBuilderTree(clazz, ".", - "src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java",true); + "src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java", true); assertEquals(1, list.size()); CamelNodeDetails details = list.get(0); assertEquals("src/test/java/org/apache/camel/parser/java/MyJavaDslRouteBuilder.java", details.getFileName()); http://git-wip-us.apache.org/repos/asf/camel/blob/bfffd714/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java ---------------------------------------------------------------------- diff --git a/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java b/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java index b1b5a17..5334256 100644 --- a/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java +++ b/tooling/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterJavaDslTwoRoutesTest.java @@ -42,7 +42,7 @@ public class RoasterJavaDslTwoRoutesTest extends CamelTestSupport { JavaClassSource clazz = (JavaClassSource) Roaster.parse(new File("src/test/java/org/apache/camel/parser/java/TwoRoutesRouteBuilder.java")); List<CamelNodeDetails> list = RouteBuilderParser.parseRouteBuilderTree(clazz, ".", - "src/test/java/org/apache/camel/parser/java/TwoRoutesRouteBuilder.java",true); + "src/test/java/org/apache/camel/parser/java/TwoRoutesRouteBuilder.java", true); assertEquals(2, list.size()); CamelNodeDetails details = list.get(0);
