Skip to content

Commit

Permalink
changes to new version
Browse files Browse the repository at this point in the history
  • Loading branch information
eugene-kamenev committed Jul 16, 2014
1 parent 03eec75 commit b92cf1a
Show file tree
Hide file tree
Showing 63 changed files with 653 additions and 2,005 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -8,8 +8,8 @@ allprojects {
mavenLocal()
}

def groovy = '2.3.2'
def wicket = '6.15.0'
def groovy = '2.3.4'
def wicket = '6.16.0'

dependencies {
compile "org.codehaus.groovy:groovy-all:${groovy}"
Expand Down
27 changes: 13 additions & 14 deletions core/core.iml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="groovy-spring-experiment.wicket-groovy-dsl" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="wicket-groovy-dsl" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/groovy" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/groovy" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
Expand All @@ -14,17 +16,14 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="Gradle: wicket-core-6.15.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: wicket-util-6.15.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: wicket-request-6.15.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: wicketstuff-stateless-6.15.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: slf4j-simple-1.6.4" level="project" />
<orderEntry type="library" exported="" name="Gradle: wicket-6.15.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: groovy-all-2.3.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: slf4j-api-1.6.4" level="project" />
<orderEntry type="library" exported="" name="Gradle: wicket-devutils-6.15.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: javax.servlet-api-3.0.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: wicket-extensions-6.15.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.codehaus.groovy:groovy-all:2.3.4" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.wicket:wicket-core:6.16.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.wicket:wicket-devutils:6.16.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: javax.servlet:javax.servlet-api:3.0.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.6.4" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.wicket:wicket-util:6.16.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.wicket:wicket-request:6.16.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.wicket:wicket-extensions:6.16.0" level="project" />
</component>
</module>

459 changes: 342 additions & 117 deletions core/src/main/groovy/wicket/groovy/WicketDSL.groovy

Large diffs are not rendered by default.

149 changes: 0 additions & 149 deletions core/src/main/groovy/wicket/groovy/WicketFormDSL.groovy

This file was deleted.

23 changes: 0 additions & 23 deletions core/src/main/groovy/wicket/groovy/core/OperatorsOverload.groovy

This file was deleted.

@@ -1,18 +1,12 @@
package wicket.groovy.core.components.ajax

import groovy.transform.CompileStatic
import groovy.transform.InheritConstructors
import org.apache.wicket.ajax.markup.html.AjaxLink
import org.apache.wicket.model.IModel
import wicket.groovy.core.traits.WicketLinkTrait

/**
* Extended by @eugenekamenev
*/
@CompileStatic
class GroovyAjaxLink<T> extends AjaxLink<T> implements WicketLinkTrait {

GroovyAjaxLink(String id, IModel<T> model = null, Map<String, Closure> override = null) {
super(id, model)
this.override = override
}
@InheritConstructors
class GroovyAjaxLink<T> extends AjaxLink<T> implements WicketLinkTrait<T> {
}
@@ -1,23 +1,13 @@
package wicket.groovy.core.components.basic

import groovy.transform.CompileStatic
import groovy.transform.InheritConstructors
import org.apache.wicket.markup.html.link.BookmarkablePageLink
import org.apache.wicket.request.mapper.parameter.PageParameters
import wicket.groovy.core.traits.WicketComponentTrait

/**
* Extended by @eugenekamenev
*/
@CompileStatic
@InheritConstructors
class GroovyBookmarkablePageLink extends BookmarkablePageLink implements WicketComponentTrait {

GroovyBookmarkablePageLink(String id, Class<?> pageClass, Map<String, Closure> override = null) {
super(id, pageClass)
this.override = override
}

GroovyBookmarkablePageLink(String id, Class<?> pageClass, PageParameters parameters, Map<String, Closure> override = null) {
super(id, pageClass, parameters)
this.override = override
}
}
@@ -1,23 +1,10 @@
package wicket.groovy.core.components.basic

import groovy.transform.CompileStatic
import org.apache.wicket.MarkupContainer
import groovy.transform.InheritConstructors
import org.apache.wicket.markup.html.panel.Fragment
import org.apache.wicket.model.IModel
import wicket.groovy.core.traits.WicketComponentTrait

/**
* Extended by @eugenekamenev
*/
@CompileStatic
class GroovyFragment extends Fragment implements WicketComponentTrait {
GroovyFragment(String id, String markupId, MarkupContainer markupProvider, Map<String, Closure> override = null) {
super(id, markupId, markupProvider)
this.override = override
}

GroovyFragment(String id, String markupId, MarkupContainer markupProvider, IModel<?> model, Map<String, Closure> override = null) {
super(id, markupId, markupProvider, model)
this.override = override
}
@InheritConstructors
class GroovyFragment<T> extends Fragment implements WicketComponentTrait<T> {
}
@@ -1,46 +1,13 @@
package wicket.groovy.core.components.basic

import groovy.transform.CompileStatic
import groovy.transform.InheritConstructors
import org.apache.wicket.markup.html.image.Image
import org.apache.wicket.model.IModel
import org.apache.wicket.request.mapper.parameter.PageParameters
import org.apache.wicket.request.resource.IResource
import org.apache.wicket.request.resource.ResourceReference
import wicket.groovy.core.traits.WicketComponentTrait

/**
* Extended by @eugenekamenev
*/
@CompileStatic
@InheritConstructors
class GroovyImage<T> extends Image implements WicketComponentTrait {

GroovyImage(String id, Map<String, Closure> override = null) {
super(id)
this.override = override
}

GroovyImage(String id, ResourceReference resourceReference, Map<String, Closure> override = null) {
super(id, resourceReference)
this.override = override
}

GroovyImage(String id, ResourceReference resourceReference, PageParameters resourceParameters, Map<String, Closure> override = null) {
super(id, resourceReference, resourceParameters)
this.override = override
}

GroovyImage(String id, IResource imageResource, Map<String, Closure> override = null) {
super(id, imageResource)
this.override = override
}

GroovyImage(String id, IModel<T> model, Map<String, Closure> override = null) {
super(id, model)
this.override = override
}

GroovyImage(String id, String string, Map<String, Closure> override = null) {
super(id, string)
this.override = override
}
}
@@ -1,33 +1,13 @@
package wicket.groovy.core.components.basic

import groovy.transform.CompileStatic
import groovy.transform.InheritConstructors
import org.apache.wicket.markup.html.basic.Label
import org.apache.wicket.model.IModel
import wicket.groovy.core.traits.WicketComponentTrait

/**
* Extended by @eugenekamenev
*/
@CompileStatic
class GroovyLabel extends Label implements WicketComponentTrait {

GroovyLabel(String id, Map<String, Closure> override = null) {
super(id)
this.override = override
}

GroovyLabel(String id, String label, Map<String, Closure> override = null) {
super(id, label)
this.override = override
}

GroovyLabel(String id, Serializable label, Map<String, Closure> override = null) {
super(id, label)
this.override = override
}

GroovyLabel(String id, IModel<?> model, Map<String, Closure> override = null) {
super(id, model)
this.override = override
}
@InheritConstructors
class GroovyLabel<T> extends Label implements WicketComponentTrait<T> {
}

0 comments on commit b92cf1a

Please sign in to comment.