diff --git a/doclet/resources/classes.edn b/doclet/resources/classes.edn index 6eb10d9..c26a04a 100644 --- a/doclet/resources/classes.edn +++ b/doclet/resources/classes.edn @@ -1,70 +1,70 @@ {"Align" {"align" :static-fields} "Animation" {"play-mode" :static-fields - "animation!" :methods} - "AnimationController" {"animation-controller!" :methods} + "animation" :methods} + "AnimationController" {"animation-controller" :methods} "Application" {"app!" :methods} - "Array" {"gdx-array!" :methods} - "ArrayMap" {"gdx-array-map!" :methods} + "Array" {"gdx-array" :methods} + "ArrayMap" {"gdx-array-map" :methods} "AssetManager" {"asset-manager" :methods} "AtlasTmxMapLoader" {"loader :atlas-tmx-map" :methods} "Audio" {"audio!" :methods} - "Bezier" {"bezier!" :methods} + "Bezier" {"bezier" :methods} "BitmapFont" {"bitmap-font" :constructors} "BitmapFontLoader" {"loader :bitmap-font" :methods} "BlendingAttribute" {"attribute :blending" :constructors "attribute-type :blending" :static-fields "attribute! :blending" :static-methods} - "Body" {"body!" :methods} + "Body" {"create-body!" :methods} "BodyDef" {"body-def" :fields} - "Bresenham2" {"bresenham-2!" :methods} - "BSpline" {"b-spline!" :methods} + "Bresenham2" {"bresenham-2" :methods} + "BSpline" {"b-spline" :methods} "Button.ButtonStyle" {"style :button" :constructors} - "CatmullRomSpline" {"catmull-rom-spline!" :methods} - "Circle" {"circle!" :methods} + "CatmullRomSpline" {"catmull-rom-spline" :methods} + "Circle" {"circle" :methods} "Color" {"color" :static-fields} "ColorAttribute" {"attribute :color" :constructors "attribute-type :color" :static-fields "attribute! :color" :static-methods} "Contact" {"contact!" :methods} - "ConvexHull" {"convex-hull!" :methods} - "ChainShape" {"chain-shape!" :methods} - "CheckBox" {"check-box!" :methods} + "ConvexHull" {"convex-hull" :methods} + "ChainShape" {"chain-shape" :methods} + "CheckBox" {"check-box" :methods} "CheckBox.CheckBoxStyle" {"style :check-box" :constructors} - "CircleShape" {"circle-shape!" :methods} + "CircleShape" {"circle-shape" :methods} "CubemapAttribute" {"attribute :cubemap" :constructors "attribute-type :cubemap" :static-fields "attribute! :cubemap" :static-methods} - "DelaunayTriangulator" {"delauny-triangulator!" :methods} + "DelaunayTriangulator" {"delauny-triangulator" :methods} "DepthTestAttribute" {"attribute :depth-test" :constructors "attribute-type :depth-test" :static-fields "attribute! :depth-test" :static-methods} - "Dialog" {"dialog!" :methods} + "Dialog" {"dialog" :methods} "DistanceJointDef" {"joint-def :distance" :fields} - "EarClippingTriangulator" {"ear-clipping-triangulator!" :methods} - "EdgeShape" {"edge-shape!" :methods} - "Ellipse" {"ellipse!" :methods} - "Environment" {"environment!" :methods} + "EarClippingTriangulator" {"ear-clipping-triangulator" :methods} + "EdgeShape" {"edge-shape" :methods} + "Ellipse" {"ellipse" :methods} + "Environment" {"environment" :methods} "Files" {"files!" :methods} "Fixture" {"fixture!" :methods} "FixtureDef" {"fixture-def" :fields} "FloatAttribute" {"attribute :float" :constructors "attribute-type :float" :static-fields "attribute! :float" :static-methods} - "FloatCounter" {"float-counter!" :methods} + "FloatCounter" {"float-counter" :methods} "FrictionJointDef" {"joint-def :friction" :fields} - "Frustum" {"frustum!" :methods} + "Frustum" {"frustum" :methods} "GearJointDef" {"joint-def :gear" :fields} "GeometryUtils" {"geometry!" :static-methods} "Graphics" {"graphics!" :methods} - "GridPoint2" {"grid-point-2!" :methods} - "GridPoint3" {"grid-point-3!" :methods} + "GridPoint2" {"grid-point-2" :methods} + "GridPoint3" {"grid-point-3" :methods} "GL20" {"gl!" :methods} - "HexagonalTiledMapRenderer" {"hexagonal-tiled-map!" :methods} - "HorizontalGroup" {"horizontal!" :methods} - "Image" {"image!" :methods} - "ImageButton" {"image-button!" :methods} + "HexagonalTiledMapRenderer" {"hexagonal-tiled-map" :methods} + "HorizontalGroup" {"horizontal" :methods} + "Image" {"image" :methods} + "ImageButton" {"image-button" :methods} "ImageButton.ImageButtonStyle" {"style :image-button" :constructors} - "ImageTextButton" {"image-text-button!" :methods} + "ImageTextButton" {"image-text-button" :methods} "ImageTextButton.ImageTextButtonStyle" {"style :image-text-button" :constructors} "Input" {"input!" :methods} "Input.Keys" {"key-word" :static-fields} @@ -73,80 +73,80 @@ "IntAttribute" {"attribute :int" :constructors "attribute-type :int" :static-fields "attribute! :int" :static-methods} - "IsometricStaggeredTiledMapRenderer" {"isometric-staggered-tiled-map!" :methods} - "IsometricTiledMapRenderer" {"isometric-tiled-map!" :methods} - "Joint" {"joint!" :methods} - "Label" {"label!" :methods} - "Material" {"material!" :methods} + "IsometricStaggeredTiledMapRenderer" {"isometric-staggered-tiled-map" :methods} + "IsometricTiledMapRenderer" {"isometric-tiled-map" :methods} + "Joint" {"create-joint!" :methods} + "Label" {"label" :methods} + "Material" {"material" :methods} "MathUtils" {"math!" :static-methods} - "Matrix3" {"matrix-3!" :methods} - "Matrix4" {"matrix-4!" :methods} - "ModelBatch" {"model-batch!" :methods} - "ModelBuilder" {"model-builder!" :methods} - "ModelInstance" {"model!" :methods} + "Matrix3" {"matrix-3" :methods} + "Matrix4" {"matrix-4" :methods} + "ModelBatch" {"model-batch" :methods} + "ModelBuilder" {"model-builder" :methods} + "ModelInstance" {"model" :methods} "ModelLoader" {"loader :model" :methods} "MouseJointDef" {"joint-def :mouse" :fields} "MusicLoader" {"loader :music" :methods} "Net" {"net!" :methods} - "NinePatch" {"nine-patch!" :methods} + "NinePatch" {"nine-patch" :methods} "NinePatchDrawable" {"drawable :nine-patch" :constructors} - "OrthogonalTiledMapRenderer" {"orthogonal-tiled-map!" :methods} - "OrthographicCamera" {"orthographic!" :methods} - "ParticleEffect" {"particle-effect!" :methods} - "PerspectiveCamera" {"perspective!" :methods} + "OrthogonalTiledMapRenderer" {"orthogonal-tiled-map" :methods} + "OrthographicCamera" {"orthographic" :methods} + "ParticleEffect" {"particle-effect" :methods} + "PerspectiveCamera" {"perspective" :methods} "PixmapLoader" {"loader :pixmap" :methods} - "Plane" {"plane!" :methods} + "Plane" {"plane" :methods} "Plane.PlaneSide" {"plane-side" :static-fields} - "Polygon" {"polygon!" :methods} - "PolygonShape" {"polygon-shape!" :methods} - "Polyline" {"polyline!" :methods} + "Polygon" {"polygon" :methods} + "PolygonShape" {"polygon-shape" :methods} + "Polyline" {"polyline" :methods} "PrismaticJointDef" {"joint-def :prismatic" :fields} "ProgressBar.ProgressBarStyle" {"style :progress-bar" :constructors} "PulleyJointDef" {"joint-def :pulley" :fields} - "Quaternion" {"quaternion!" :methods} - "Rectangle" {"rectangle!" :methods} + "Quaternion" {"quaternion" :methods} + "Rectangle" {"rectangle" :methods} "RevoluteJointDef" {"joint-def :revolute" :fields} "RopeJointDef" {"joint-def :rope" :fields} "Scaling" {"scaling" :static-fields} - "ScrollPane" {"scroll-pane!" :methods} + "ScrollPane" {"scroll-pane" :methods} "ScrollPane.ScrollPaneStyle" {"style :scroll-pane" :constructors} - "SelectBox" {"select-box!" :methods} + "SelectBox" {"select-box" :methods} "SelectBox.SelectBoxStyle" {"style :select-box" :constructors} "Skin" {"skin" :methods} "SkinLoader" {"loader :skin" :methods} - "Slider" {"slider!" :methods} + "Slider" {"slider" :methods} "Sound" {"sound!" :methods} "SoundLoader" {"loader :sound" :methods} "SplitPane.SplitPaneStyle" {"style :split-pane" :constructors} "SpriteDrawable" {"drawable :sprite" :constructors} - "Stack" {"stack!" :methods} - "Stage" {"stage!" :methods} - "Table" {"table!" :methods} - "TextureAtlas" {"texture-atlas!" :methods} + "Stack" {"stack" :methods} + "Stage" {"stage" :methods} + "Table" {"table" :methods} + "TextureAtlas" {"texture-atlas" :methods} "TextureAttribute" {"attribute :texture" :constructors "attribute-type :texture" :static-fields "attribute! :texture" :static-methods} - "TextButton" {"text-button!" :methods} + "TextButton" {"text-button" :methods} "TextButton.TextButtonStyle" {"style :text-button" :constructors} - "TextField" {"text-field!" :methods} + "TextField" {"text-field" :methods} "TextField.TextFieldStyle" {"style :text-field" :constructors} "TextureLoader" {"loader :texture" :methods} - "TextureRegion" {"texture!" :methods} + "TextureRegion" {"texture" :methods} "TextureRegionDrawable" {"drawable :texture-region" :constructors} - "Tree" {"tree!" :methods} + "Tree" {"tree" :methods} "TmxMapLoader" {"loader :tmx-map" :methods} "Touchpad.TouchpadStyle" {"style :touchpad" :constructors} - "TiledMap" {"tiled-map!" :methods} - "TiledMapTileLayer" {"tiled-map-layer!" :methods} - "TiledMapTileLayer.Cell" {"tiled-map-cell!" :methods} + "TiledMap" {"tiled-map" :methods} + "TiledMapTileLayer" {"tiled-map-layer" :methods} + "TiledMapTileLayer.Cell" {"tiled-map-cell" :methods} "Tree.TreeStyle" {"style :tree" :constructors} - "Vector2" {"vector-2!" :methods} - "Vector3" {"vector-3!" :methods} + "Vector2" {"vector-2" :methods} + "Vector3" {"vector-3" :methods} "VertexAttributes.Usage" {"usage" :static-fields} - "VerticalGroup" {"vertical!" :methods} + "VerticalGroup" {"vertical" :methods} "WeldJointDef" {"joint-def :weld" :fields} "WheelJointDef" {"joint-def :wheel" :fields} - "Window" {"window!" :methods} + "Window" {"window" :methods} "Window.WindowStyle" {"style :window" :constructors} - "WindowedMean" {"windowed-mean!" :methods} - "World" {"box-2d!" :methods}} \ No newline at end of file + "WindowedMean" {"windowed-mean" :methods} + "World" {"box-2d" :methods}} \ No newline at end of file diff --git a/doclet/src/clojure/play_clj_doclet/core.clj b/doclet/src/clojure/play_clj_doclet/core.clj index ab99f64..e3a51dd 100644 --- a/doclet/src/clojure/play_clj_doclet/core.clj +++ b/doclet/src/clojure/play_clj_doclet/core.clj @@ -71,11 +71,6 @@ (map #(vector (first %) (parse-class-entry c (second %)))) (into {}))) -(defn match? - [doc-name sym-name] - (or (= doc-name sym-name) - (.startsWith doc-name (str sym-name " ")))) - (defn process-group [{:keys [type raw] :as group} doc-map] (let [form (read-string raw) @@ -85,7 +80,7 @@ (assoc group :name (str n) :java (->> doc-map - (filter #(match? (first %) (str n))) + (filter #(.startsWith (first %) (str n))) (sort-by first) vec)))))